diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 11:51:23 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-12-03 10:11:17 -0800 |
| commit | 74878fb6368eb254d5bedd8f21a165562222919f (patch) | |
| tree | 4829f2cb60e5b1090b8501e3d1150db2e7c9e859 | |
| parent | 73931b5ee92d013b7b7d62927cca2a8dfdf3a9d3 (diff) | |
rcutorture: Add --kmake-arg argument to kvm.sh
This commit adds the --kmake-arg to kvm.sh, which allows passing in
things like "V=1" to see the build commands, as well as enabling the
CROSS_COMPILE= make macro used for cross-building.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/rcutorture/bin/kvm.sh | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh b/tools/testing/selftests/rcutorture/bin/kvm-build.sh index 618ef2c543f..8c4aa7d6339 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh @@ -60,7 +60,7 @@ then exit 2 fi ncpus=`cpus2use.sh` -make O=$builddir -j$ncpus > $builddir/Make.out 2>&1 +make O=$builddir -j$ncpus $RCU_KMAKE_ARG > $builddir/Make.out 2>&1 retval=$? if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out then diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index a833160dcdc..69b6523bb85 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -34,6 +34,7 @@ dur=30 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM builddir="${KVM}/b1" RCU_INITRD="$KVM/initrd"; export RCU_INITRD +RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG resdir="" configs="" ds=`date +%Y.%m.%d-%H:%M:%S` @@ -48,6 +49,7 @@ usage () { echo " --datestamp string" echo " --duration minutes" echo " --interactive" + echo " --kmake-arg kernel-make-arguments" echo " --kversion vN.NN" echo " --mac nn:nn:nn:nn:nn:nn" echo " --no-initrd" @@ -114,6 +116,11 @@ do --interactive) RCU_QEMU_INTERACTIVE=1; export RCU_QEMU_INTERACTIVE ;; + --kmake-arg) + checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$' + RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG + shift + ;; --kversion) checkarg --kversion "(kernel version)" $# "$2" '^v[0-9.]*$' '^error' kversion=$2 |