[Swift-commit] r4681 - trunk/tests

[achavez at ci.uchicago.edu]

Author: achavez
Date: 2011-06-23 18:03:18 -0500 (Thu, 23 Jun 2011)
New Revision: 4681

Modified:
   trunk/tests/suite.sh
Log:
When -n or -k parameters were passed, suite.sh failed to show the summary of tests run, passed and failed. This issue has been fixed.

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-06-23 22:22:13 UTC (rev 4680)
+++ trunk/tests/suite.sh	2011-06-23 23:03:18 UTC (rev 4681)
@@ -641,8 +641,9 @@
   rm killed_test > /dev/null 2>&1 && sleep 5
   verbose "killing monitor: $MONITOR_PID..."
   kill $MONITOR_PID
+  INDIVIDUAL_TEST_TIME=$(( STOP-START ))
 
-  echo "TOOK (seconds): $(( STOP-START ))"
+  echo "TOOK (seconds): $INDIVIDUAL_TEST_TIME"
 
   RESULT=$( result )
   NOPASO="Failed"
@@ -950,6 +951,7 @@
     for ((i=0; $i<$ITERS_LOCAL; i=$i+1)); do
       script_test_case $TESTNAME
       (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return
+
       (( $SHUTDOWN )) && return
     done
     end_row
@@ -1064,7 +1066,7 @@
   start_group "Group $GROUPCOUNT: $TITLE"
   test_group
   (( GROUPCOUNT++ ))
-  (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && break
+  (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && end_row | html_~tr | group_statistics && break
   (( $SHUTDOWN )) && break
 done