Messages in this thread | | | Date | Tue, 13 May 2014 12:00:22 -0700 | From | "Paul E. McKenney" <> | Subject | Re: [PATCH tip/core/rcu 08/45] torture: Rename RCU_KMAKE_ARG to TORTURE_KMAKE_ARG |
| |
On Wed, May 07, 2014 at 02:23:20PM -0700, josh@joshtriplett.org wrote: > On Mon, Apr 28, 2014 at 05:24:56PM -0700, Paul E. McKenney wrote: > > From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> > > > > This commit makes the torture scripts a bit more RCU-independent. > > You've also dropped unnecessary "export" calls; please document that in > the commit message. With that change:
Good catch, done!
Thanx, Paul
> > Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> > Reviewed-by: Josh Triplett <josh@joshtriplett.org> > > > --- > > tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- > > tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +++--- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh b/tools/testing/selftests/rcutorture/bin/kvm-build.sh > > index d8e68a5e4411..e838c775f709 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 $RCU_KMAKE_ARG > $builddir/Make.out 2>&1 > > +make O=$builddir -j$ncpus $TORTURE_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 59945b7793d9..04ad1f980dfe 100644 > > --- a/tools/testing/selftests/rcutorture/bin/kvm.sh > > +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh > > @@ -40,7 +40,7 @@ KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM > > PATH=${KVM}/bin:$PATH; export PATH > > TORTURE_DEFCONFIG=defconfig > > TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD > > -RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG > > +TORTURE_KMAKE_ARG="" > > TORTURE_SUITE=rcu > > resdir="" > > configs="" > > @@ -118,7 +118,7 @@ do > > ;; > > --kmake-arg) > > checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$' > > - RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG > > + TORTURE_KMAKE_ARG="$2" > > shift > > ;; > > --kversion) > > @@ -376,7 +376,7 @@ then > > echo PATH="$PATH; export PATH" > > echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY" > > echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD" > > - echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG" > > + echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG" > > echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" > > echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE" > > echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC" > > -- > > 1.8.1.5 > > >
| |