diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 14:51:23 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-12-03 13:11:17 -0500 |
| 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 618ef2c543fd..8c4aa7d63394 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh | |||
| @@ -60,7 +60,7 @@ then | |||
| 60 | exit 2 | 60 | exit 2 |
| 61 | fi | 61 | fi |
| 62 | ncpus=`cpus2use.sh` | 62 | ncpus=`cpus2use.sh` |
| 63 | make O=$builddir -j$ncpus > $builddir/Make.out 2>&1 | 63 | make O=$builddir -j$ncpus $RCU_KMAKE_ARG > $builddir/Make.out 2>&1 |
| 64 | retval=$? | 64 | retval=$? |
| 65 | if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out | 65 | if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out |
| 66 | then | 66 | then |
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index a833160dcdc3..69b6523bb854 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh | |||
| @@ -34,6 +34,7 @@ dur=30 | |||
| 34 | KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM | 34 | KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM |
| 35 | builddir="${KVM}/b1" | 35 | builddir="${KVM}/b1" |
| 36 | RCU_INITRD="$KVM/initrd"; export RCU_INITRD | 36 | RCU_INITRD="$KVM/initrd"; export RCU_INITRD |
| 37 | RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG | ||
| 37 | resdir="" | 38 | resdir="" |
| 38 | configs="" | 39 | configs="" |
| 39 | ds=`date +%Y.%m.%d-%H:%M:%S` | 40 | ds=`date +%Y.%m.%d-%H:%M:%S` |
| @@ -48,6 +49,7 @@ usage () { | |||
| 48 | echo " --datestamp string" | 49 | echo " --datestamp string" |
| 49 | echo " --duration minutes" | 50 | echo " --duration minutes" |
| 50 | echo " --interactive" | 51 | echo " --interactive" |
| 52 | echo " --kmake-arg kernel-make-arguments" | ||
| 51 | echo " --kversion vN.NN" | 53 | echo " --kversion vN.NN" |
| 52 | echo " --mac nn:nn:nn:nn:nn:nn" | 54 | echo " --mac nn:nn:nn:nn:nn:nn" |
| 53 | echo " --no-initrd" | 55 | echo " --no-initrd" |
| @@ -114,6 +116,11 @@ do | |||
| 114 | --interactive) | 116 | --interactive) |
| 115 | RCU_QEMU_INTERACTIVE=1; export RCU_QEMU_INTERACTIVE | 117 | RCU_QEMU_INTERACTIVE=1; export RCU_QEMU_INTERACTIVE |
| 116 | ;; | 118 | ;; |
| 119 | --kmake-arg) | ||
| 120 | checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$' | ||
| 121 | RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG | ||
| 122 | shift | ||
| 123 | ;; | ||
| 117 | --kversion) | 124 | --kversion) |
| 118 | checkarg --kversion "(kernel version)" $# "$2" '^v[0-9.]*$' '^error' | 125 | checkarg --kversion "(kernel version)" $# "$2" '^v[0-9.]*$' '^error' |
| 119 | kversion=$2 | 126 | kversion=$2 |
