[Swift-commit] r4953 - branches/release-0.93/tests

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-08-05 18:33:01 -0500 (Fri, 05 Aug 2011)
New Revision: 4953

Modified:
   branches/release-0.93/tests/suite.sh
Log:
changed output naming to match test file name rather than having some random numeric id

Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh	2011-08-05 23:32:25 UTC (rev 4952)
+++ branches/release-0.93/tests/suite.sh	2011-08-05 23:33:01 UTC (rev 4953)
@@ -369,7 +369,7 @@
 				printf %-10.10s "success">>$REPORT
 			else
 				echo -e "${RED}FAILED${GRAY}"
-				cat $RUNDIR/$TEST_LOG < /dev/null
+				cat $RUNDIR/$OUTPUT < /dev/null
 				printf %-10.10s "failure">>$REPORT
 			fi
 
@@ -383,16 +383,16 @@
 	    	# WIDTH=$( width "$LABEL" )
 	    	if [ "$RESULT" == "Passed" ]; then
 	      		html_td class "success" width 25 title "$CMD"
-	      		html_a_href $TEST_LOG "$LABEL"
+	      		html_a_href $OUTPUT "$LABEL"
 	      	elif [ "$RESULT" == "None" ]; then
 	      		html_td width 25
 		   		html "  "
    				html_~td
 	    	else
 	      		echo -e "${RED}FAILED${GRAY}"
-	      		cat $RUNDIR/$TEST_LOG < /dev/null
+	      		cat $RUNDIR/$OUTPUT < /dev/null
 	      		html_td class "failure" width 25 title "$CMD"
-	      		html_a_href $TEST_LOG $LABEL
+	      		html_a_href $OUTPUT $LABEL
 	    	fi
 	    	html_~td
 	  	elif [ "$TYPE" == "package" ]; then
@@ -484,19 +484,6 @@
 	fi
 }
 
-# Create test output_*.txt file and copy to stdout.txt
-# Rename to copy_output?
-# TEST_LOG = test log
-test_log() {
-  TEST_LOG="output_$LOGCOUNT.txt"
-  banner "$LASTCMD" $RUNDIR/$TEST_LOG
-  if [ -f $OUTPUT ]; then
-    cp $OUTPUT $RUNDIR/$TEST_LOG 2>>$LOG
-    cp $OUTPUT $RUNDIR/stdout.txt
-  fi
-  let "LOGCOUNT=$LOGCOUNT+1"
-}
-
 stars() {
   for i in {1..120}
   do
@@ -602,9 +589,9 @@
   fi
 
   RESULT=$( result )
-  test_log
-  output_report test $SEQ "$LASTCMD" $RESULT $TEST_LOG
 
+  output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
+
   check_bailout
 
   let "SEQ=$SEQ+1"
@@ -701,8 +688,7 @@
 
 
   LASTCMD="$@"
-  test_log
-  output_report test $SEQ "$LASTCMD" $RESULT $TEST_LOG
+  output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
 
   check_bailout
 
@@ -717,7 +703,6 @@
   process_exec $SCRIPT
   RESULT=$( result )
 
-  test_log
   output_report test "$SYMBOL" "$LASTCMD" $RESULT
 
   check_bailout
@@ -800,6 +785,8 @@
   ARGSFILE=$NAME.args
 
   TEST_SHOULD_FAIL=0
+  
+  OUTPUT=$NAME.setup.stdout
   if [ -x $GROUP/$SETUPSCRIPT ]; then
     script_exec $GROUP/$SETUPSCRIPT "S"
   else
@@ -821,6 +808,7 @@
   grep THIS-SCRIPT-SHOULD-FAIL $SWIFTSCRIPT > /dev/null
   TEST_SHOULD_FAIL=$(( ! $?  ))
 
+  OUTPUT=$NAME.stdout
   monitored_exec $TIMEOUT swift     \
                        -wrapperlog.always.transfer true \
                        -sitedir.keep true               \
@@ -830,13 +818,15 @@
                        $CDM $SWIFTSCRIPT $ARGS
 
   TEST_SHOULD_FAIL=0
+  OUTPUT=$NAME.check.stdout
   if [ -x $GROUP/$CHECKSCRIPT ]; then
-  	export OUTPUT
+  	export TEST_LOG=$NAME.stdout
     script_exec $GROUP/$CHECKSCRIPT "√"
   else
     check_outputs $GROUP $NAME
   fi
 
+  OUTPUT=$NAME.clean.stdout
   if [ -x $GROUP/$CLEANSCRIPT ]; then
     script_exec $GROUP/$CLEANSCRIPT "C"
   else
@@ -858,6 +848,8 @@
   TIMEOUTFILE=$NAME.timeout
 
   TEST_SHOULD_FAIL=0
+  
+  OUTPUT=$NAME.setup.stdout
   if [ -x $GROUP/$SETUPSCRIPT ]; then
     script_exec $GROUP/$SETUPSCRIPT "S"
   else
@@ -879,6 +871,7 @@
    html_~td
   fi
 
+  OUTPUT=$NAME.stdout
   if [ -x $GROUP/$SHELLSCRIPT ]; then
     script_exec $SHELLSCRIPT "X"
   else
@@ -887,6 +880,7 @@
    html_~td
   fi
 
+  OUTPUT=$NAME.check.stdout
   if [ -x $GROUP/$CHECKSCRIPT ]; then
     script_exec $GROUP/$CHECKSCRIPT "√"
   else
@@ -895,6 +889,7 @@
    html_~td
   fi
 
+  OUTPUT=$NAME.clean.stdout
   if [ -x $GROUP/$CLEANSCRIPT ]; then
     script_exec $GROUP/$CLEANSCRIPT "C"
   else
@@ -1171,6 +1166,7 @@
 start_group "Build"
 TESTLINK=
 EXITONFAILURE=true
+OUTPUT=checkout.stdout
 if [ "$SKIP_CHECKOUT" != "1" ]; then
   TESTNAME="Checkout CoG"
   start_row
@@ -1188,6 +1184,7 @@
 TESTNAME="Compile"
 start_row
 
+OUTPUT=compile.stdout
 # Exit early if the Swift directory is not there
 if [[ ! -d $TOPDIR/cog/modules/swift ]]
 then
@@ -1206,6 +1203,7 @@
 fi
 SWIFT_HOME=$TOPDIR/cog/modules/swift/dist/swift-svn
 
+OUTPUT=build.stdout
 if [ $BUILD_PACKAGE = "1" ]; then
   build_package
 fi