Skip to content

Commit 603d11a

Browse files
melverpaulmckrcu
authored andcommitted
torture: Pass --kmake-arg to all make invocations
We need to pass the arguments provided to --kmake-arg to all make invocations. In particular, the make invocations generating the configs need to see the final make arguments, e.g. if config variables depend on particular variables that are passed to make. For example, when using '--kcsan --kmake-arg CC=clang-11', we would lose CONFIG_KCSAN=y due to 'make oldconfig' not seeing that we want to use a compiler that supports KCSAN. Signed-off-by: Marco Elver <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 7752275 commit 603d11a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/testing/selftests/rcutorture/bin/configinit.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ if test -z "$TORTURE_TRUST_MAKE"
3232
then
3333
make clean > $resdir/Make.clean 2>&1
3434
fi
35-
make $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1
35+
make $TORTURE_KMAKE_ARG $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1
3636
mv .config .config.sav
3737
sh $T/upd.sh < .config.sav > .config
3838
cp .config .config.new
39-
yes '' | make oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err
39+
yes '' | make $TORTURE_KMAKE_ARG oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err
4040

4141
# verify new config matches specification.
4242
configcheck.sh .config $c

0 commit comments

Comments
 (0)