--- a/mmtestenv/mmtesttools/Build/buildutils/mmbuild2.py	Tue Feb 02 01:56:55 2010 +0200
+++ b/mmtestenv/mmtesttools/Build/buildutils/mmbuild2.py	Sat Feb 20 00:20:15 2010 +0200
@@ -151,14 +151,16 @@
         commands += ["--logfile=-"] # send output to stdout
         if self.iOptions.keepgoing:
             commands += ["--keepgoing"]
-        if len(remainingArgs)>0 and remainingArgs[0]=="winscw":
+        if testBuild:
+            commands += ["--config=winscw.test"]
+        else:
+            commands += ["--config=winscw"]
+        if not(len(remainingArgs)>0 and remainingArgs[0]=="winscw"):
+            # not the winscw scenario - we want both winscw and armv5
             if testBuild:
-                commands += ["--config=winscw.test"]
+                commands += ["--config=armv5.test"]
             else:
-                commands += ["--config=winscw"]
-        else:
-            if testBuild:
-               commands += ["--config=default.test"]
+                commands += ["--config=armv5"]
         commands += ["--filters=FilterSquashLog"] # reduce log size
         commands += ["--tries=2"] # retry on failure - e.g. for license fails
         commands += ["build"]