diff options
| author | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-06-24 18:12:39 +0200 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-06-24 18:12:39 +0200 |
| commit | b989ff070574ad8b8621d866de0a8e9a65d42c80 (patch) | |
| tree | f93489ff6715891e4d13bc3e09521000894d18e6 /tools/testing/selftests/rcutorture/bin/kvm-build.sh | |
| parent | tools/memory-model: Improve data-race detection (diff) | |
| parent | Merge branches 'consolidate.2019.05.28a', 'doc.2019.05.28a', 'fixes.2019.06.1... (diff) | |
| download | linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.tar.xz linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.zip | |
Merge LKMM and RCU commits
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/kvm-build.sh')
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-build.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh b/tools/testing/selftests/rcutorture/bin/kvm-build.sh index c27a0bbb9c02..18d6518504ee 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh @@ -3,7 +3,7 @@ # # Build a kvm-ready Linux kernel from the tree in the current directory. # -# Usage: kvm-build.sh config-template build-dir resdir +# Usage: kvm-build.sh config-template resdir # # Copyright (C) IBM Corporation, 2011 # @@ -15,8 +15,7 @@ then echo "kvm-build.sh :$config_template: Not a readable file" exit 1 fi -builddir=${2} -resdir=${3} +resdir=${2} T=${TMPDIR-/tmp}/test-linux.sh.$$ trap 'rm -rf $T' 0 @@ -29,14 +28,14 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_CONSOLE=y ___EOF___ -configinit.sh $T/config O=$builddir $resdir +configinit.sh $T/config $resdir retval=$? if test $retval -gt 1 then exit 2 fi ncpus=`cpus2use.sh` -make O=$builddir -j$ncpus $TORTURE_KMAKE_ARG > $resdir/Make.out 2>&1 +make -j$ncpus $TORTURE_KMAKE_ARG > $resdir/Make.out 2>&1 retval=$? if test $retval -ne 0 || grep "rcu[^/]*": < $resdir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $resdir/Make.out then |