Commit 7f71554b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ktest-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest 

Pull ktest updates from Steven Rostedt:

 - Fix use of KERNEL_VERSION in newly created output directory

   If a new output directory is created (O=/dir), and one of the options
   uses KERNEL_VERSION which will run a "make kernelversion" in the
   output directory, it will fail because there is no config file yet.

   In this case, have it do a "make allnoconfig" which is the minimal
   needed to run the "make kernelversion".

 - Remove unused variables

 - Fix some typos

* tag 'ktest-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest.pl: Fix typo "accesing"
  ktest.pl: Fix typo in comment
  ktest.pl: Remove unused declarations in run_bisect_test function
  ktest.pl: Check kernelrelease return in get_version
parents 544521d6 f3a30016

tools/testing/ktest/examples/include/defaults.conf

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ CLEAR_LOG = 1 


SSH_USER = root



# For accesing the machine, we will ssh to root@machine.

# For accessing the machine, we will ssh to root@machine.

SSH := ssh ${SSH_USER}@${MACHINE}



# Update this. The default here is ktest will ssh to the target box

tools/testing/ktest/ktest.pl

+6 −3
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ sub __read_config { 
	    # Config variables are only active while reading the

	    # config and can be defined anywhere. They also ignore

	    # TEST_START and DEFAULTS, but are skipped if they are in

	    # on of these sections that have SKIP defined.

	    # one of these sections that have SKIP defined.

	    # The save variable can be

	    # defined multiple times and the new one simply overrides

	    # the previous one.
@@ -2419,6 +2419,11 @@ sub get_version { 
    return if ($have_version);

    doprint "$make kernelrelease ... ";

    $version = `$make -s kernelrelease | tail -1`;

    if (!length($version)) {

	run_command "$make allnoconfig" or return 0;

	doprint "$make kernelrelease ... ";

	$version = `$make -s kernelrelease | tail -1`;

    }

    chomp($version);

    doprint "$version\n";

    $have_version = 1;
@@ -2960,8 +2965,6 @@ sub run_bisect_test { 


    my $failed = 0;

    my $result;

    my $output;

    my $ret;



    $in_bisect = 1;