Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9dd5d63 authored by Rabin Vincent's avatar Rabin Vincent Committed by Steven Rostedt
Browse files

ktest: Save test output 

The test output may contain useful information; save it along with the
already-saved buildlog, dmesg, and .config.

Link: http://lkml.kernel.org/r/1321616131-21352-1-git-send-email-rabin@rab.in



Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f9dfb65b

tools/testing/ktest/ktest.pl

+19 −11
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ my $in_patchcheck = 0; 
my $run_test;

my $redirect;

my $buildlog;

my $testlog;

my $dmesg;

my $monitor_fp;

my $monitor_pid;
@@ -1021,17 +1022,19 @@ sub fail { 
	    mkpath($faildir) or

		die "can't create $faildir";

	}

	if (-f "$output_config") {

	    cp "$output_config", "$faildir/config" or

		die "failed to copy .config";

	}

	if (-f $buildlog) {

	    cp $buildlog, "$faildir/buildlog" or

		die "failed to move $buildlog";



	my %files = (

		"config" => $output_config,

		"buildlog" => $buildlog,

		"dmesg" => $dmesg,

		"testlog" => $testlog,

	);



	while (my ($name, $source) = each(%files)) {

		if (-f "$source") {

			cp "$source", "$faildir/$name" or

				die "failed to copy $source";

		}

	if (-f $dmesg) {

	    cp $dmesg, "$faildir/dmesg" or

		die "failed to move $dmesg";

	}



	doprint "*** Saved info to $faildir ***\n";
@@ -1669,7 +1672,10 @@ sub child_run_test { 
    $poweroff_on_error = 0;

    $die_on_failure = 1;



    $redirect = "$testlog";

    run_command $run_test or $failed = 1;

    undef $redirect;



    exit $failed;

}
@@ -3169,6 +3175,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { 
    $target = "$ssh_user\@$machine";



    $buildlog = "$tmpdir/buildlog-$machine";

    $testlog = "$tmpdir/testlog-$machine";

    $dmesg = "$tmpdir/dmesg-$machine";

    $make = "$makecmd O=$outputdir";

    $output_config = "$outputdir/.config";
@@ -3205,6 +3212,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { 


    unlink $dmesg;

    unlink $buildlog;

    unlink $testlog;



    if (defined($addconfig)) {

	my $min = $minconfig;