[Swift-commit] r4692 - trunk/tests

[achavez at ci.uchicago.edu]

Author: achavez
Date: 2011-06-24 15:41:35 -0500 (Fri, 24 Jun 2011)
New Revision: 4692

Modified:
   trunk/tests/suite.sh
Log:
Enhanced HTML report

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-06-24 20:02:46 UTC (rev 4691)
+++ trunk/tests/suite.sh	2011-06-24 20:41:35 UTC (rev 4692)
@@ -397,6 +397,21 @@
 	  html "$G"
 	  html_~th
 	  html_~tr
+	
+	 html_tr group
+	 html_td
+	 html "#"
+	 html_~td
+	 html_td
+	 html "Test name"
+	 html_~td
+	 html_td
+	 html "Helper Scripts"
+	 html_~td
+	 html_td
+	 html "Execution Time"
+	 html_~td
+	 html_~tr
   fi
 }
 
@@ -410,7 +425,7 @@
 	    html "<b>$TESTCOUNT</b>"
 	    html " "
 	    html_~td
-	    html_td align right
+	    html_td align left
 	    html " "
 	    if [[ -n $TESTLINK ]]; then
 	      html_a_href $TESTLINK $TESTNAME
@@ -433,8 +448,8 @@
 		html_~tr
 		html_~table
 		html_~td
-   	        html_td align left
-   	        html "Execution Time: $INDIVIDUAL_TEST_TIME seconds"
+   	        html_td align right
+   	        html "$INDIVIDUAL_TEST_TIME seconds"
    	        html_~td
 		html_~tr
 	fi
@@ -691,8 +706,8 @@
   if [ -x $GROUP/$SETUPSCRIPT ]; then
     script_exec $GROUP/$SETUPSCRIPT "S"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td  width 25
+   html "  "
    html_~td
   fi
 
@@ -718,16 +733,16 @@
   if [ -x $GROUP/$CHECKSCRIPT ]; then
     script_exec $GROUP/$CHECKSCRIPT "√"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 
   if [ -x $GROUP/$CLEANSCRIPT ]; then
     script_exec $GROUP/$CLEANSCRIPT "C"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 }
@@ -744,8 +759,8 @@
   if [ -x $GROUP/$SETUPSCRIPT ]; then
     script_exec $GROUP/$SETUPSCRIPT "S"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 
@@ -757,32 +772,32 @@
   if [ -x $GROUP/$SETUPSCRIPT ]; then
     script_exec $GROUP/$SETUPSCRIPT "S"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 
   if [ -x $GROUP/$SHELLSCRIPT ]; then
     script_exec $SHELLSCRIPT "X"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 
   if [ -x $GROUP/$CHECKSCRIPT ]; then
     script_exec $GROUP/$CHECKSCRIPT "√"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 
   if [ -x $GROUP/$CLEANSCRIPT ]; then
     script_exec $GROUP/$CLEANSCRIPT "C"
   else
-   html_td class "neutral" width 25
-   html "NP"
+   html_td width 25
+   html "  "
    html_~td
   fi
 }
@@ -958,12 +973,10 @@
       (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return
       (( $SHUTDOWN )) && return
     done
-#     html_td align right width 50
-#     html $INDIVIDUAL_TEST_TIME
-#     html_~td
      end_row
   done
     group_statistics
+    TOTAL_TIME=0
     TESTCOUNT=0
     TESTSPASSED=0
     TESTSFAILED=0