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

[Reid Spencer]

Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.44 -> 1.45
NightlyTest.pl updated: 1.105 -> 1.106
---
Log message:

Cause the various warnings list to be generated via a <ul> list with 
text enclosed in <tt>. This ensures that (a) the text is in a fixed width
font (to indicated generated text) and (b) the text wraps without causing
the page width to be extended. The main result of this is that the report 
will wrap to conform to the window size in which it is displayed instead of
having a very wide length if a warning message is long.


---
Diffs of the changes:  (+25 -9)

 NightlyTest.pl           |   24 ++++++++++++++++++++----
 NightlyTestTemplate.html |   10 +++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)


Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.44 llvm/utils/NightlyTestTemplate.html:1.45
--- llvm/utils/NightlyTestTemplate.html:1.44	Mon Mar 13 23:54:52 2006
+++ llvm/utils/NightlyTestTemplate.html	Mon Mar 20 19:21:39 2006
@@ -77,7 +77,7 @@
 </ul>
 
 <h2>Warnings during the build:</h2>
-<p>$WarningsList</p>
+$WarningsList
 
 <br><br><center>
 <table border="0" cellspacing="0" cellpadding="2"><tr><td bgcolor="#000000"> 
@@ -95,10 +95,10 @@
 </ul><p>
 
 <h2>Changes to Warnings:</h2>
-<ul>
-<li>Warnings Added: $WarningsAdded
-<li>Warnings Removed: $WarningsRemoved
-</ul><p>
+<p>Warnings Added:</p>
+$WarningsAdded
+<p>Warnings Removed:</p>
+$WarningsRemoved
 
 <h2>Changes in the test suite:</h2>
 <ul>


Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.105 llvm/utils/NightlyTest.pl:1.106
--- llvm/utils/NightlyTest.pl:1.105	Fri Mar 17 11:43:01 2006
+++ llvm/utils/NightlyTest.pl	Mon Mar 20 19:21:39 2006
@@ -151,7 +151,21 @@
 
 sub AddPreTag {  # Add pre tags around nonempty list, or convert to "none"
   $_ = shift;
-  if (length) { return "<ul><tt>$_</tt></ul>"; } else { "<b>none</b><br>"; }
+  if (length) { return "<pre>$_</pre>"; } else { "<b>none</b><br>"; }
+}
+
+sub ArrayToList { # Add <li> tags around nonempty list or convert to "none"
+  my $result = "";
+  if (scalar @_) {
+    $result = "<ul>";
+    foreach $item (@_) {
+      $result .= "<li><tt>$item</tt></li>";
+    }
+    $result .= "</ul>";
+  } else {
+    $result = "<p><b>none</b></p>";
+  }
+  return $result;
 }
 
 sub ChangeDir { # directory, logical name
@@ -528,7 +542,7 @@
   }
 }
 my $WarningsFile =  join "\n", @Warnings;
-my $WarningsList = AddPreTag $WarningsFile;
+my $WarningsList = ArrayToList @Warnings;
 $WarningsFile =~ s/:[0-9]+:/::/g;
 
 # Emit the warnings file, so we can diff...
@@ -539,8 +553,10 @@
 print "ADDED   WARNINGS:\n$WarningsAdded\n\n" if (length $WarningsAdded);
 print "REMOVED WARNINGS:\n$WarningsRemoved\n\n" if (length $WarningsRemoved);
 
-$WarningsAdded = AddPreTag $WarningsAdded;
-$WarningsRemoved = AddPreTag $WarningsRemoved;
+my @TmpWarningsAdded = split "\n", $WarningsAdded;
+my @TmpWarningsRemoved = split "\n", $WarningsRemoved;
+$WarningsAdded = ArrayToList @TmpWarningsAdded;
+$WarningsRemoved = ArrayToList @TmpWarningsRemoved;
 
 #
 # Get some statistics about CVS commits over the current day...