Skip to content

Commit

Permalink
Cause the various warnings list to be generated via a <ul> list with
Browse files Browse the repository at this point in the history
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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26916 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Reid Spencer committed Mar 21, 2006
1 parent d465126 commit 7d6a515
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
24 changes: 20 additions & 4 deletions utils/NightlyTest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,21 @@ sub AddRecord {

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
Expand Down Expand Up @@ -528,7 +542,7 @@ sub GetDejagnuTestResults { # (filename, log)
}
}
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...
Expand All @@ -539,8 +553,10 @@ sub GetDejagnuTestResults { # (filename, log)
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...
Expand Down
10 changes: 5 additions & 5 deletions utils/NightlyTestTemplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h2>CVS Tree Overview:</h2>
</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">
Expand All @@ -95,10 +95,10 @@ <h2>Changes to CVS:</h2>
</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>
Expand Down

0 comments on commit 7d6a515

Please sign in to comment.