[llvm-commits] CVS: llvm/utils/NightlyTest.pl

[LLVM]

Changes in directory llvm/utils:

NightlyTest.pl updated: 1.47 -> 1.48

---
Log message:

Clean up the Feature and Regression test output to (a) use section headers,
(b) avoid <pre> tag so page width doesn't become excessive, (c) omit the
execution time stats, (d) format each reported test in a list with bold
headings for readability, (e) omit long lines of dashes.


---
Diffs of the changes:  (+35 -10)

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.47 llvm/utils/NightlyTest.pl:1.48
--- llvm/utils/NightlyTest.pl:1.47	Sat May 29 19:17:47 2004
+++ llvm/utils/NightlyTest.pl	Mon May 31 15:59:55 2004
@@ -272,27 +272,52 @@
   if (open SRCHFILE, $filename) {
     # Skip stuff before ---TEST RESULTS
     while ( <SRCHFILE> ) {
-      if ( m/^--- TEST RESULTS/ ) { 
-	  push(@lines, $_); last; 
-      }
+      if ( m/^--- TEST RESULTS/ ) { last; }
     }
     # Process test results
+    push(@lines,"<h3>TEST RESULTS</h3><ol><li>\n");
+    my $first_list = 1;
+    my $should_break = 1;
     while ( <SRCHFILE> ) {
       if ( length($_) > 1 ) { 
-	  if ( ! m/: PASS[ ]*$/ &&
-	       ! m/^    qmtest.target:/ && 
-	       ! m/^      local/ &&
-	       ! m/^gmake:/ ) {
-	  push(@lines,$_); 
+	chomp($_);
+	if ( ! m/: PASS[ ]*$/ &&
+	     ! m/^    qmtest.target:/ && 
+	     ! m/^      local/ &&
+	     ! m/^gmake:/ ) {
+	  if ( m/: XFAIL/ || m/: XPASS/ || m/: FAIL/ ) {
+	    if ( $first_list ) {
+	      $first_list = 0;
+	      $should_break = 1;
+	      push(@lines,"<b>$_</b><br/>\n");
+	    } else {
+	      push(@lines,"</li><li><b>$_</b><br/>\n");
+	    }
+	  } elsif ( m/^--- STATISTICS/ ) {
+	    if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
+	    push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
+	    $should_break = 0;
+	  } elsif ( m/^--- TESTS WITH/ ) {
+	    $should_break = 1;
+	    $first_list = 1;
+	    push(@lines,"</pre><h3>TESTS WITH UNEXPECTED RESULTS</h3><ol><li>\n");
+	  } elsif ( m/^real / ) {
+	    last;
+	  } else {
+	    if ( $should_break ) {
+	      push(@lines,"$_<br/>\n");
+	    } else {
+	      push(@lines,"$_\n");
+	    }
+	  }
 	}
       }
     }
     close SRCHFILE;
   }
   my $content = join("", at lines);
-  return "<pre>\n at lines</pre>\n";
+  return "$content</pre>\n";
 }
-
 
 # Get results of feature tests.
 my $FeatureTestResults; # String containing the results of the feature tests