summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-10-28 08:57:29 -0700
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-12-03 10:11:18 -0800
commit32caccb8f47c032df55e77102ea43c627f1ca507 (patch)
treed6598808f7f917e92337a3847bd4a13eca605ace /tools/testing
parent6d40cc0cb4311d0c5aa4a106cc86a3d45a9ad86c (diff)
downloadop-kernel-dev-32caccb8f47c032df55e77102ea43c627f1ca507.zip
op-kernel-dev-32caccb8f47c032df55e77102ea43c627f1ca507.tar.gz
rcutorture: Move checkarg to functions.sh
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Greg KH <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/rcutorture/bin/functions.sh24
-rw-r--r--tools/testing/selftests/rcutorture/bin/kvm.sh25
2 files changed, 27 insertions, 22 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 963b6f0..3052f1b 100644
--- 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
--- 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
OpenPOWER on IntegriCloud