Make output of "make test" more verbose

This is intended to make error fixing based on tinderbox output
easier.

diff --git a/NPTest.pm b/NPTest.pm
index 1cd89db75b425ddfdaf3076f240cf828065f3f72..cbd78c82b2ac71393bc02da41424a1db0741fd25 100644 (file)
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -18,7 +18,7 @@ use File::Basename;
 use IO::File;
 use Data::Dumper;
 
-use Test;
+use Test::More;
 
 use vars qw($VERSION);
 $VERSION = "1556."; # must be all one line, for MakeMaker
@@ -625,12 +625,12 @@ sub testCmd {
        chomp $output;
        $object->output($output);
 
+       my ($pkg, $file, $line) = caller(0);
+       diag("Testing: $command", $/);
        if ($ENV{'NPTEST_DEBUG'}) {
-               my ($pkg, $file, $line) = caller(0);
-               print "testCmd: Called from line $line in $file", $/;
-               print "Testing: $command", $/;
-               print "Output:  ", $object->output, $/;
-               print "Return code: ", $object->return_code, $/;
+               diag("testCmd: Called from line $line in $file", $/);
+               diag("Output:  ", $object->output, $/);
+               diag("Return code: ", $object->return_code, $/);
        }
 
        return $object;

diff --git a/test.pl.in b/test.pl.in
index a02281856c6db373e0183c0742e2d1919cc7f6de..3834d3c3ee9d6982016ab9641d477eeb6e795323 100755 (executable)
--- a/test.pl.in
+++ b/test.pl.in
@@ -44,6 +44,6 @@ if ( ! scalar( @tests ) )
 
 use Test::Harness;
 
-#$Test::Harness::verbose=1;
+$Test::Harness::verbose=1;
 
 runtests( @tests );