From: paulmck@kernel.org
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org,
"Paul E. McKenney" <paulmck@kernel.org>
Subject: [PATCH tip/core/rcu 15/18] torture: Allow scenario-specific Kconfig options to override CFcommon
Date: Wed, 15 Apr 2020 10:30:57 -0700 [thread overview]
Message-ID: <20200415173100.9927-15-paulmck@kernel.org> (raw)
In-Reply-To: <20200415173037.GA9768@paulmck-ThinkPad-P72>
From: "Paul E. McKenney" <paulmck@kernel.org>
This commit applies config_override_param() to allow scenario-specific
Kconfig options to override those in CFcommon. This in turn will allow
additional Kconfig options to be placed in CFcommon, for example, an
option common to all but a few scenario can be placed in CFcommon and
then overridden in those few scenarios. Plus this change saves one
whole line of code.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index b7296f1..c7534fd 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -67,12 +67,11 @@ if test -r "$config_dir/CFcommon"
then
echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input
cat < $config_dir/CFcommon >> $resdir/ConfigFragment.input
- config_override.sh $config_dir/CFcommon $config_template > $T/Kc1
+ cp $config_dir/CFcommon $T/Kc0
else
- cp $config_template $T/Kc1
+ echo > $T/Kc0
fi
-echo " --- $config_template" >> $resdir/ConfigFragment.input
-cat $config_template >> $resdir/ConfigFragment.input
+config_override_param "$config_template" Kc0 Kc1 "`cat $config_template 2> /dev/null`"
config_override_param "--kcsan options" Kc1 Kc2 "$TORTURE_KCONFIG_KCSAN_ARG"
config_override_param "--kconfig argument" Kc2 Kc3 "$TORTURE_KCONFIG_ARG"
cp $T/Kc3 $resdir/ConfigFragment
--
2.9.5
next prev parent reply other threads:[~2020-04-15 17:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 17:30 [PATCH tip/core/rcu 0/18] Torture-test updates for v5.8 Paul E. McKenney
2020-04-15 17:30 ` [PATCH tip/core/rcu 01/18] rcutorture: Add KCSAN stubs paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 02/18] rcutorture: Make kvm-recheck-rcu.sh handle truncated lines paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 03/18] rcutorture: Mark data-race potential for rcu_barrier() test statistics paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 04/18] locktorture.c: Fix if-statement empty body warnings paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 05/18] Default enable RCU list lockdep debugging with PROVE_RCU paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 06/18] rcutorture: Add flag to produce non-busy-wait task stalls paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 07/18] rcutorture: Right-size TREE10 CPU consumption paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 08/18] rcu: Allow rcutorture to starve grace-period kthread paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 09/18] torture: Add --kcsan argument to top-level kvm.sh script paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 10/18] torture: Make --kcsan argument also create a summary paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 11/18] rcutorture: Make rcu_fwds and rcu_fwd_emergency_stop static paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 12/18] torture: Eliminate duplicate #CHECK# from ConfigFragment paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 13/18] torture: Abstract application of additional Kconfig options paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 14/18] torture: Allow --kconfig options to override --kcsan defaults paulmck
2020-04-15 17:30 ` paulmck [this message]
2020-04-15 17:30 ` [PATCH tip/core/rcu 16/18] torture: Save a few lines by using config_override_param initially paulmck
2020-04-15 17:30 ` [PATCH tip/core/rcu 17/18] torture: Add a --kasan argument paulmck
2020-04-15 17:31 ` [PATCH tip/core/rcu 18/18] rcutorture: Convert ULONG_CMP_LT() to time_before() paulmck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415173100.9927-15-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).