Commit 603d11ad authored by Marco Elver's avatar Marco Elver Committed by Paul E. McKenney

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: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 77522751
...@@ -32,11 +32,11 @@ if test -z "$TORTURE_TRUST_MAKE" ...@@ -32,11 +32,11 @@ if test -z "$TORTURE_TRUST_MAKE"
then then
make clean > $resdir/Make.clean 2>&1 make clean > $resdir/Make.clean 2>&1
fi fi
make $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1 make $TORTURE_KMAKE_ARG $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1
mv .config .config.sav mv .config .config.sav
sh $T/upd.sh < .config.sav > .config sh $T/upd.sh < .config.sav > .config
cp .config .config.new cp .config .config.new
yes '' | make oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err yes '' | make $TORTURE_KMAKE_ARG oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err
# verify new config matches specification. # verify new config matches specification.
configcheck.sh .config $c configcheck.sh .config $c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment