Remove use of old config stuff from acceptance-metadata-single.sh.

Don't use hard-coded paths.

diff --git a/lustre/tests/acceptance-metadata-single.sh b/lustre/tests/acceptance-metadata-single.sh
index 501d2be..6201657 100644 (file)
--- a/lustre/tests/acceptance-metadata-single.sh
+++ b/lustre/tests/acceptance-metadata-single.sh
@@ -6,20 +6,30 @@ set -e
 # load, varying debug levels
 #
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+SRCDIR="`dirname $0`"
+CREATE=$SRCDIR/create.pl
+
+debug_client_on()
+{
+       echo -1 > /proc/sys/portals/debug
+}
+
+debug_client_off()
+{
+       echo 0 > /proc/sys/portals/debug
+}
 
 MNT=${MNT:-/mnt/lustre}
 
 debug_client_on
 echo "create.pl, 1 mount, 1 thread, 10 ops, debug on"
-perl create.pl -- $MNT -1 10
+perl $CREATE -- $MNT -1 10
 echo "create.pl, 1 mount, 1 thread, 100 ops, debug on"
-perl create.pl --silent -- $MNT -1 100
+perl $CREATE --silent -- $MNT -1 100
 echo "create.pl --mcreate=0, 1 mount, 1 thread, 10 ops, debug on"
-perl create.pl --mcreate=0 -- $MNT -1 10
+perl $CREATE --mcreate=0 -- $MNT -1 10
 echo "create.pl --mcreate=0, 1 mount, 1 thread, 100 ops, debug on"
-perl create.pl --mcreate=0 --silent -- $MNT -1 100
+perl $CREATE --mcreate=0 --silent -- $MNT -1 100
 echo "rename.pl, 1 mount, 1 thread, 10 ops, debug on"
 perl rename.pl $MNT 10
 echo "rename.pl, 1 mount, 1 thread, 100 ops, debug on"
@@ -27,20 +37,20 @@ perl rename.pl --silent $MNT 100
 
 debug_client_off
 echo "create.pl, 1 mount, 1 thread, 1000 ops, debug off"
-perl create.pl --silent -- $MNT -1 1000
+perl $CREATE --silent -- $MNT -1 1000
 echo "create.pl --mcreate=0, 1 mount, 1 thread, 1000 ops, debug off"
-perl create.pl --silent --mcreate=0 -- $MNT -1 1000
+perl $CREATE --silent --mcreate=0 -- $MNT -1 1000
 echo "rename.pl, 1 mount, 1 thread, 1000 ops, debug off"
 perl rename.pl --silent $MNT 1000
 
 debug_client_on
 echo "create.pl, 1 mount, 2 threads, 100 ops, debug on"
-perl create.pl --silent -- $MNT -1 100 &
-perl create.pl --silent -- $MNT -1 100 &
+perl $CREATE --silent -- $MNT -1 100 &
+perl $CREATE --silent -- $MNT -1 100 &
 wait
 echo "create.pl --mcreate=0, 1 mount, 2 threads, 100 ops, debug on"
-perl create.pl --silent --mcreate=0 -- $MNT -1 100 &
-perl create.pl --silent --mcreate=0 -- $MNT -1 100 &
+perl $CREATE --silent --mcreate=0 -- $MNT -1 100 &
+perl $CREATE --silent --mcreate=0 -- $MNT -1 100 &
 wait
 echo "rename.pl, 1 mount, 2 thread, 1000 ops, debug on"
 perl rename.pl --silent $MNT 1000 &
@@ -49,12 +59,12 @@ wait
 
 debug_client_off
 echo "create.pl, 1 mount, 2 threads, 2000 ops, debug off"
-perl create.pl --silent -- $MNT -1 2000 &
-perl create.pl --silent -- $MNT -1 2000 &
+perl $CREATE --silent -- $MNT -1 2000 &
+perl $CREATE --silent -- $MNT -1 2000 &
 wait
 echo "create.pl --mcreate=0, 1 mount, 2 threads, 2000 ops, debug off"
-perl create.pl --silent --mcreate=0 -- $MNT -1 2000 &
-perl create.pl --silent --mcreate=0 -- $MNT -1 2000 &
+perl $CREATE --silent --mcreate=0 -- $MNT -1 2000 &
+perl $CREATE --silent --mcreate=0 -- $MNT -1 2000 &
 wait
 echo "rename.pl, 1 mount, 2 threads, 2000 ops, debug off"
 perl rename.pl --silent $MNT 2000 &
@@ -64,12 +74,12 @@ wait
 debug_client_on
 echo "create.pl, 1 mount, 4 threads, 100 ops, debug on"
 for i in `seq 1 4`; do
-  perl create.pl --silent -- $MNT -1 100 &
+  perl $CREATE --silent -- $MNT -1 100 &
 done
 wait
 echo "create.pl --mcreate=0, 1 mount, 4 threads, 100 ops, debug on"
 for i in `seq 1 4`; do
-  perl create.pl --silent --mcreate=0 -- $MNT -1 100 &
+  perl $CREATE --silent --mcreate=0 -- $MNT -1 100 &
 done
 wait
 echo "rename.pl, 1 mount, 4 threads, 2000 ops, debug on"
@@ -81,12 +91,12 @@ wait
 debug_client_off
 echo "create.pl, 1 mount, 4 threads, 2000 ops, debug off"
 for i in `seq 1 4`; do
-  perl create.pl --silent -- $MNT -1 2000 &
+  perl $CREATE --silent -- $MNT -1 2000 &
 done
 wait
 echo "create.pl --mcreate=0, 1 mount, 4 threads, 2000 ops, debug off"
 for i in `seq 1 4`; do
-  perl create.pl --silent --mcreate=0 -- $MNT -1 2000 &
+  perl $CREATE --silent --mcreate=0 -- $MNT -1 2000 &
 done
 wait
 echo "rename.pl, 1 mount, 4 threads, 2000 ops, debug off"
@@ -98,12 +108,12 @@ wait
 debug_client_on
 echo "create.pl, 1 mount, 8 threads, 500 ops, debug on"
 for i in `seq 1 8`; do
-  perl create.pl --silent -- $MNT -1 500 &
+  perl $CREATE --silent -- $MNT -1 500 &
 done
 wait
 echo "create.pl --mcreate=0, 1 mount, 8 threads, 500 ops, debug on"
 for i in `seq 1 8`; do
-  perl create.pl --silent --mcreate=0 -- $MNT -1 500 &
+  perl $CREATE --silent --mcreate=0 -- $MNT -1 500 &
 done
 wait
 echo "rename.pl, 1 mount, 8 threads, 2000 ops, debug on"
@@ -115,12 +125,12 @@ wait
 debug_client_off
 echo "create.pl, 1 mount, 8 threads, 2000 ops, debug off"
 for i in `seq 1 8`; do
-  perl create.pl --silent -- $MNT -1 2000 &
+  perl $CREATE --silent -- $MNT -1 2000 &
 done
 wait
 echo "create.pl --mcreate=0, 1 mount, 8 threads, 2000 ops, debug off"
 for i in `seq 1 8`; do
-  perl create.pl --silent --mcreate=0 -- $MNT -1 2000 &
+  perl $CREATE --silent --mcreate=0 -- $MNT -1 2000 &
 done
 wait
 echo "rename.pl, 1 mount, 8 threads, 2000 ops, debug off"