Commit b843cdb1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Rethink logging of test recipes 



The logging that was performed in OpenSSL::Test was initially set up
as a means not to let messages that test programs write to STDERR get
displayed when a test isn't running in verbose mode.  However, the way
it was implemented, it meant that those messages were never displayed,
and you had to look in a test log.  This also meant that output to
STDERR and output to STDOUT got broken apart, which isn't optimal.

So, we remove the whole test log file implementation, and instead,
we're sending STDERR to the null device unless one of these conditions
apply:

- the test recipe already redirects stderr.  Just let it.
- the environment variable HARNESS_ACTIVE is undefined, meaning the
  recipe is run directly as a perl script instead of being harnessed
  by Test::Harness
- the environment variable HARNESS_VERBOSE is set.

Getting a full log of the tests now becomes as simple as this:

    HARNESS_VERBOSE=yes make test 2>&1 | tee tests.log

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 6faffd0a

test/testlib/OpenSSL/Test.pm

+8 −31
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ sub __env; 
sub __cwd;

sub __apps_file;

sub __results_file;

sub __test_log;

sub __fixup_cmd;

sub __build_cmd;
@@ -136,9 +135,6 @@ sub setup { 
	unless -f srctop_file("Configure");



    __cwd($directories{RESULTS});



    # Loop in case we're on a platform with more than one file generation

    1 while unlink(__test_log());

}



=over 4
@@ -309,7 +305,7 @@ the function C<with> further down. 
=cut



sub run {

    my ($cmd, $display_cmd, %errlogs) = shift->(0);

    my ($cmd, $display_cmd) = shift->(0);

    my %opts = @_;



    return () if !$cmd;
@@ -336,15 +332,6 @@ sub run { 
    # non-zero.

    $? = 0;



    open ERR, ">>", __test_log();

    { local $| = 1; print ERR "$display_cmd => $e\n"; }

    foreach (keys %errlogs) {

	copy($_,\*ERR);

	copy($_,$errlogs{$_}) if defined($errlogs{$_});

	unlink($_);

    }

    close ERR;



    if ($opts{capture}) {

	return @r;

    } else {
@@ -541,7 +528,7 @@ command as a string. 
=cut



sub cmdstr {

    my ($cmd, $display_cmd, %errlogs) = shift->(0);

    my ($cmd, $display_cmd) = shift->(0);



    return $display_cmd;

}
@@ -616,11 +603,6 @@ is located. Defaults to C<$TOP/apps> (adapted to the operating system). 
If defined, its value should be the directory where the test applications

are located.  Defaults to C<$TOP/test> (adapted to the operating system).



=item B<RESULT_D>



If defined, its value should be the directory where the log files are

located.  Defaults to C<$TEST_D>.



=item B<STOPTEST>



If defined, it puts testing in a different mode, where a recipe with
@@ -701,10 +683,6 @@ sub __results_file { 
    return catfile($directories{RESULTS},@_,$f);

}



sub __test_log {

    return __results_file("$test_name.log");

}



sub __cwd {

    my $dir = catdir(shift);

    my %opts = @_;
@@ -757,7 +735,6 @@ sub __cwd { 
	print STDERR "  \$directories{APPS}    = \"$directories{APPS}\"\n";

	print STDERR "  \$directories{SRCTOP}  = \"$directories{SRCTOP}\"\n";

	print STDERR "  \$directories{BLDTOP}  = \"$directories{BLDTOP}\"\n";

	print STDERR "  \$test_log             = \"",__test_log(),"\"\n";

	print STDERR "\n";

	print STDERR "  current directory is \"",curdir(),"\"\n";

	print STDERR "  the way back is \"$reverse\"\n";
@@ -852,19 +829,19 @@ sub __build_cmd { 
    $stdout= " > ".$fileornull->($opts{stdout}) if exists($opts{stdout});

    $stderr=" 2> ".$fileornull->($opts{stderr}) if exists($opts{stderr});



    $saved_stderr = $opts{stderr}		if defined($opts{stderr});



    my $errlog =

        __results_file($num ? "$test_name.$num.tmp_err" : "$test_name.tmp_err");

    my $display_cmd = "$cmd$arg_str$stdin$stdout$stderr";

    $cmd .= "$arg_str$stdin$stdout 2> $errlog";



    $stderr=" 2> ".$null

        unless $stderr || !$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE};



    $cmd .= "$arg_str$stdin$stdout$stderr";



    if ($debug) {

	print STDERR "DEBUG[__build_cmd]: \$cmd = \"$cmd\"\n";

	print STDERR "DEBUG[__build_cmd]: \$display_cmd = \"$display_cmd\"\n";

    }



    return ($cmd, $display_cmd, $errlog => $saved_stderr);

    return ($cmd, $display_cmd);

}



=head1 SEE ALSO