[Swift-commit] r3636 - trunk/tests

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-09-21 16:23:49 -0500 (Tue, 21 Sep 2010)
New Revision: 3636

Modified:
   trunk/tests/nightly.sh
Log:
Log fix in error case


Modified: trunk/tests/nightly.sh
===================================================================
--- trunk/tests/nightly.sh	2010-09-21 20:57:47 UTC (rev 3635)
+++ trunk/tests/nightly.sh	2010-09-21 21:23:49 UTC (rev 3636)
@@ -22,7 +22,9 @@
 # Each *.swift test may be accompanied by a
 # *.setup.sh, *.check.sh, and/or *.clean.sh script
 # and a *.timeout specifier
-# The scripts may setup and inspect files in RUNDIR including exec.out
+# The scripts may setup and inspect files in RUNDIR including exec.out,
+# which must be accessed in stdout.txt, because the currently running
+# tested process writes to exec.out, stdout.txt is a copy
 # The GROUP scripts can read the GROUP variable
 # The timeout number in the *.timeout file overrides the default
 # timeout
@@ -348,7 +350,7 @@
       html_a_href $TEST_LOG "$LABEL"
     else
       echo "FAILED"
-      cat $TEST_LOG < /dev/null
+      cat $RUNDIR/$TEST_LOG < /dev/null
       html "<td class=\"failure\" $WIDTH title=\"$CMD\">"
       html_a_href $TEST_LOG $LABEL
     fi
@@ -416,7 +418,6 @@
 # TEST_LOG = test log
 test_log() {
   TEST_LOG="output_$LOGCOUNT.txt"
-  rm -fv $TEST_LOG
   banner "$LASTCMD" $RUNDIR/$TEST_LOG
   if [ -f $OUTPUT ]; then
     cp -v $OUTPUT $RUNDIR/$TEST_LOG 2>>$LOG