Catch-up merge from master sources to mps/branch/2013-05-17/emergency.

Copied from Perforce
 Change: 182170
 ServerID: perforce.ravenbrook.com

2 files changed, 11 insertions, 13 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index ee0da903bc7..a4d41a9cbd9 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -231,21 +231,19 @@ all: mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awluthe \
      mps.a mpsplan.a
 
 
-# Runs the automatic tests that are built with CONFIG_PROD_MPS.
-# These tests are run overnight (see design.buildsys.overnight).
-#   bttest & teletest cannot be run unattended
-# %%TARGET: When adding a new target, if target is suitable for the
-# overnight tests, then add it here.
-TESTCASES=abqtest amcss amcsshe amcssth amsss amssshe apss arenacv awlut \
-          awluthe btcv cbstest finalcv finaltest lockcov locv \
+# Runs the automated tests.
+# 
+# %%TARGET: When adding a new target, if target is suitable for
+# running as an automated test, then add it here.
+# 
+# bttest and teletest are not listed here because they are interactive
+# and so cannot be run unattended.
+TESTCASES=abqtest amcss amcsshe amcssth amsss amssshe apss arenacv \
+          awlut awluthe btcv cbstest finalcv finaltest lockcov locv \
           messtest mpmss mpsicv mv2test poolncv qs sacss segsmss \
           steptest walkt0
 testrun: $(TESTCASES)
-        OUTPUT=$$(mktemp -d /tmp/mps.log.XXXXXX); \
-        echo "Logging test output to $$OUTPUT"; \
-        $(^:%=(TEST=%; TESTCASE=$(PFM)/$(VARIETY)/$$TEST; \
-         echo "Running $$TESTCASE" && \
-         $$TESTCASE > $$OUTPUT/$$TEST || (cat $$OUTPUT/$$TEST; exit 1)) &&) true
+        ../tool/testrun.sh $(addprefix $(PFM)/$(VARIETY)/,$(TESTCASES))
 
 # These convenience targets allow one to type "make foo" to build target
 # foo in selected varieties (or none, for the latter rule).
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 4274ff87e43..36b3e7ddac8 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -2444,7 +2444,7 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "#   bttest & teletest cannot be run unattended\n#   amcssth doesn't work on OS X (job001621)\nTESTCASES=\"abqtest amcss amcsshe amsss amssshe apss arenacv awlut \\\n           awluthe btcv cbstest finalcv finaltest lockcov locv \\\n           messtest mpmss mpsicv mv2test poolncv qs sacss segsmss \\\n           steptest walkt0\"\nOUTPUT=$(mktemp -d /tmp/mps.log.XXXXXX)\necho \"Logging test output to $OUTPUT\"\nfor TEST in $TESTCASES; do\n    TESTCASE=$TARGET_BUILD_DIR/$TEST\n    echo \"Running $TEST ($CONFIGURATION)\"\n    $TESTCASE > $OUTPUT/$TEST || (cat $OUTPUT/$TEST; exit 1)\ndone\necho \"All tests pass.\"\n\n# Coverage\nif [ \"$CONFIGURATION\" == \"Debug\" ]; then\n    (cd xc/$PROJECT.build/$CONFIGURATION/$PROJECT.build/Objects-normal/x86_64 &&\n     gcov mps.c 2> $OUTPUT/gcov) |\n    python ../tool/gcovfmt.py $OUTPUT/coverage\nfi";
+                        shellScript = "# bttest and teletest are not listed here because they cannot be run\n# unattended.\nTESTCASES=\"abqtest amcss amcsshe amcssth amsss amssshe apss arenacv \\\n           awlut awluthe btcv cbstest finalcv finaltest lockcov locv \\\n           messtest mpmss mpsicv mv2test poolncv qs sacss segsmss \\\n           steptest walkt0\"\n../tool/testrun.sh $(for TEST in $TESTCASES; do echo $TARGET_BUILD_DIR/$TEST; done)\n\n# Coverage\nif [ \"$CONFIGURATION\" == \"Debug\" ]; then\n    (cd xc/$PROJECT.build/$CONFIGURATION/$PROJECT.build/Objects-normal/x86_64 &&\n     gcov mps.c 2> /dev/null) | ../tool/gcovfmt.py\nfi";
                         showEnvVarsInLog = 0;
                 };
 /* End PBXShellScriptBuildPhase section */