Added a --verbose option to runtests.sh that the tinderbox scripts can use to get all the warnings and errors and whatnot into the build log. Also corrected several syntax and logic errors in the 1.t test file.

2 files changed, 22 insertions, 7 deletions

diff --git a/runtests.sh b/runtests.sh
index d220f7c20..c558fcf7d 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,3 +1,12 @@
 #!/bin/sh
 
-/usr/bonsaitools/bin/perl -e 'use Test::Harness qw(&runtests $verbose); $verbose=0; runtests @ARGV;' t/*.t
+export VERBOSE=0
+PART1='use Test::Harness qw(&runtests $verbose); $verbose='
+PART2='; runtests @ARGV;'
+for f in $*; do
+  if [ $f == "--verbose" ] ; then
+    export VERBOSE=1
+  fi
+done
+
+/usr/bonsaitools/bin/perl -e "${PART1}${VERBOSE}${PART2}" t/*.t
diff --git a/t/1.t b/t/1.t
index c748a56e4..39cdc9a15 100644
--- a/t/1.t
+++ b/t/1.t
@@ -48,7 +48,7 @@ BEGIN { use_ok('RelationSet'); }
 BEGIN { use_ok('Bug'); }
 
 # and now we test the scripts
-@testitems = qw(
+@testitems = split("\n",qq(
 bug_form.pl #4
 buglist.cgi #5
 changepassword.cgi #6
@@ -97,20 +97,26 @@ token.cgi #48
 userprefs.cgi #49
 whineatnews.pl #50
 xml.cgi #51
-);
+));
 our $warnings;
+my $verbose = $::ENV{VERBOSE};
 $perlapp='/usr/bonsaitools/bin/perl';
 foreach $file (@testitems) {
+        $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
+        next if (!$file); # skip null entries
 	$command = "$perlapp"." -c $file 2>&1";
 	$loginfo=`$command`;
 #	  print '@@'.$loginfo.'##';
 	if ($loginfo =~ /syntax ok$/im) {
 		$warnings{$_} = 1 foreach ($loginfo =~ /\((W.*?)\)/mg);
-		if ($1) { ok(0,$file."--WARNING"); }
-		else {
-			ok(1,$file."--ERROR-AND-WARNING-FREE");
+		if ($1) {
+                        if ($verbose) { print STDERR $loginfo; }
+                        ok(0,$file."--WARNING");
+                } else {
+			ok(1,$file);
 		}
 	} else {
+                if ($verbose) { print STDERR $loginfo; }
 		ok(0,$file."--ERROR");
-	}
+        }
 }