rcutorture: Move checkarg to functions.sh

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 963b6f0..3052f1b 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -28,6 +28,30 @@ bootparam_hotplug_cpu () {
        echo "$1" | grep -q "rcutorture\.onoff_"
 }
 
+# checkarg --argname argtype $# arg mustmatch cannotmatch
+#
+# Checks the specified argument "arg" against the mustmatch and cannotmatch
+# patterns.
+checkarg () {
+       if test $3 -le 1
+       then
+               echo $1 needs argument $2 matching \"$5\"
+               usage
+       fi
+       if echo "$4" | grep -q -e "$5"
+       then
+               :
+       else
+               echo $1 $2 \"$4\" must match \"$5\"
+               usage
+       fi
+       if echo "$4" | grep -q -e "$6"
+       then
+               echo $1 $2 \"$4\" must not match \"$6\"
+               usage
+       fi
+}
+
 # configfrag_boot_params bootparam-string config-fragment-file
 #
 # Adds boot parameters from the .boot file, if any.

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 0783ec9..7ba375e 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -32,6 +32,7 @@ args="$*"
 
 dur=30
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
+PATH=${KVM}/bin:$PATH; export PATH
 builddir="${KVM}/b1"
 RCU_INITRD="$KVM/initrd"; export RCU_INITRD
 RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
@@ -40,6 +41,8 @@ configs=""
 ds=`date +%Y.%m.%d-%H:%M:%S`
 kversion=""
 
+. functions.sh
+
 usage () {
        echo "Usage: $scriptname optional arguments:"
        echo "       --bootargs kernel-boot-arguments"
@@ -60,27 +63,6 @@ usage () {
        exit 1
 }
 
-# checkarg --argname argtype $# arg mustmatch cannotmatch
-checkarg () {
-       if test $3 -le 1
-       then
-               echo $1 needs argument $2 matching \"$5\"
-               usage
-       fi
-       if echo "$4" | grep -q -e "$5"
-       then
-               :
-       else
-               echo $1 $2 \"$4\" must match \"$5\"
-               usage
-       fi
-       if echo "$4" | grep -q -e "$6"
-       then
-               echo $1 $2 \"$4\" must not match \"$6\"
-               usage
-       fi
-}
-
 while test $# -gt 0
 do
        case "$1" in
@@ -164,7 +146,6 @@ do
        shift
 done
 
-PATH=${KVM}/bin:$PATH; export PATH
 CONFIGFRAG=${KVM}/configs; export CONFIGFRAG
 KVPATH=${CONFIGFRAG}/$kversion; export KVPATH