Fix OSC_DEVNO. It was set initially in the inferior environment variable

config method, but we can name devices now.  It is still convenient to
save this value to avoid having to get it for each test.  Maybe the
--thread and --device code can be changed to support device names directly
(if they don't already by virtue of using the same device setup code).

diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index a434dae..b724548 100644 (file)
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 export PATH=/sbin:/usr/sbin:$PATH
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
 setup_opts $@
@@ -21,6 +21,8 @@ for CMD in test_getattr test_brw_read test_brw_write; do
        setup_server || exit -1
        setup_client || exit -1
 
+       OSC_DEVNO=`$OBDCTL name2dev OSCDEV`
+
        # We use '--threads 1 X' instead of '--device X' so that
        # obdctl can modnitor the forked thread for progress (TODO).
        $OBDCTL --threads 1 v $OSC_DEVNO $CMD 1 $RW v || exit -1