Commit 02decf98 authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Wentao Guan
Browse files

ktest.pl: Check kernelrelease return in get_version 

stable inclusion
from stable-v6.6.76
commit fe215b8dd76c836bc4680edf58e05e34155d29cb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBW08Q

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fe215b8dd76c836bc4680edf58e05e34155d29cb

--------------------------------

commit a4e17a8f239a545c463f8ec27db4ed6e74b31841 upstream.

In the case of a test that uses the special option ${KERNEL_VERSION} in one
of its settings but has no configuration available in ${OUTPUT_DIR}, for
example if it's a new empty directory, then the `make kernelrelease` call
will fail and the subroutine will chomp an empty string, silently. Fix that
by adding an empty configuration and retrying.

Cc: stable@vger.kernel.org
Cc: John Hawley <warthog9@eaglescrag.net>
Fixes: 5f9b6ced ("ktest: Bisecting, install modules, add logging")
Link: https://lore.kernel.org/20241205-ktest_kver_fallback-v2-1-869dae4c7777@suse.com


Signed-off-by: default avatarRicardo B. Marliere <rbm@suse.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit fe215b8dd76c836bc4680edf58e05e34155d29cb)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 3f41ad36

tools/testing/ktest/ktest.pl

+5 −0
Original line number Diff line number Diff line
@@ -2406,6 +2406,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;