From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 286AA1F8EEA for ; Tue, 21 Jan 2025 23:25:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737501959; cv=none; b=pQSrlbGMFyFx3TugVyLMReurcFG+Fp5Y4P4XwXk/aLYhly9LQfX16ga2HElODWzCvXlHZO0AC9HIAx4gZYnT+74/a3jyk5Tv8oaSRjBbaD75T/IRCvUc9nZDE1yhKPYgN76j0nkW2kD/0m+t+Acs4QXkSnb8v3avy+GxuBlKsyw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737501959; c=relaxed/simple; bh=XB+UtV5iVNGp100MwJWDW7dbdBaYx8LMu/JR+hnI+sw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Dw5Az4pe71s3fTRcJdGaZIpGgjr7UFS9ep9GbvF9cZUn6rur1CDNUvdZVGp7eHODf/ABUKxv9z/0pW2JtTmAE/qBHvkbifc6RpA1GzBK+oPpETIb8ZexE5AHAgfApHLzlT0bUCxdfuECrvQxv4PHRw/CpPoThG6mxrxJO82xS1U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8F27C4CEE2; Tue, 21 Jan 2025 23:25:57 +0000 (UTC) Date: Tue, 21 Jan 2025 18:26:01 -0500 From: Steven Rostedt To: Linus Torvalds Cc: LKML , John 'Warthog9' Hawley , Ba Jing , "Ricardo B. Marliere" , WangYuli Subject: [GIT PULL] ktest.pl: Updates for 6.14 Message-ID: <20250121182601.44f5f11f@gandalf.local.home> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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;