Skip to content

Commit 7f71554

Browse files
committed
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
2 parents 544521d + f3a3001 commit 7f71554

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CLEAR_LOG = 1
4646

4747
SSH_USER = root
4848

49-
# For accesing the machine, we will ssh to root@machine.
49+
# For accessing the machine, we will ssh to root@machine.
5050
SSH := ssh ${SSH_USER}@${MACHINE}
5151

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

tools/testing/ktest/ktest.pl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ sub __read_config {
12451245
# Config variables are only active while reading the
12461246
# config and can be defined anywhere. They also ignore
12471247
# TEST_START and DEFAULTS, but are skipped if they are in
1248-
# on of these sections that have SKIP defined.
1248+
# one of these sections that have SKIP defined.
12491249
# The save variable can be
12501250
# defined multiple times and the new one simply overrides
12511251
# the previous one.
@@ -2419,6 +2419,11 @@ sub get_version {
24192419
return if ($have_version);
24202420
doprint "$make kernelrelease ... ";
24212421
$version = `$make -s kernelrelease | tail -1`;
2422+
if (!length($version)) {
2423+
run_command "$make allnoconfig" or return 0;
2424+
doprint "$make kernelrelease ... ";
2425+
$version = `$make -s kernelrelease | tail -1`;
2426+
}
24222427
chomp($version);
24232428
doprint "$version\n";
24242429
$have_version = 1;
@@ -2960,8 +2965,6 @@ sub run_bisect_test {
29602965

29612966
my $failed = 0;
29622967
my $result;
2963-
my $output;
2964-
my $ret;
29652968

29662969
$in_bisect = 1;
29672970

0 commit comments

Comments
 (0)