[GIT PULL] ktest.pl: Updates for 6.14

[GIT PULL] ktest.pl: Updates for 6.14

[Steven Rostedt]

Linus,

ktest updates for v6.14:

- 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


Please pull the latest ktest-6.14 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
ktest-6.14

Tag SHA1: a4e95ceb0d30a872f4a8287d6fa0b80fe92c575e
Head SHA1: f3a30016e4b557495d49df7851f18ad97b6d5a23


Ba Jing (2):
      ktest.pl: Remove unused declarations in run_bisect_test function
      ktest.pl: Fix typo in comment

Ricardo B. Marliere (1):
      ktest.pl: Check kernelrelease return in get_version

WangYuli (1):
      ktest.pl: Fix typo "accesing"

----
 tools/testing/ktest/examples/include/defaults.conf | 2 +-
 tools/testing/ktest/ktest.pl                       | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---------------------------
diff --git a/tools/testing/ktest/examples/include/defaults.conf b/tools/testing/ktest/examples/include/defaults.conf
index 63a1a83f4f0b..f6d8517a471e 100644
--- a/tools/testing/ktest/examples/include/defaults.conf
+++ b/tools/testing/ktest/examples/include/defaults.conf
@@ -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
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index dacad94e2be4..8c8da966c641 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -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;
 

Re: [GIT PULL] ktest.pl: Updates for 6.14

[pr-tracker-bot]

The pull request you sent on Tue, 21 Jan 2025 18:26:01 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest-6.14

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7f71554b4ea27ebd03e712abd386b66360147469

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html