- cleanups in fld replay test.

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 214e6cf..4e2c6ca 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -78,9 +78,8 @@ seq_get_width()
 }
 
 test_0c() {
-    local device=$(mdsdevname 1)
-    local label=`do_facet $SINGLEMDS "e2label ${device}" | grep -v "CMD: "`
-    [ -z "$label" ] && echo "No label for ${device}" && exit 1
+    local label=`mdsdevlabel 1`
+    [ -z "$label" ] && echo "No label for mds1" && exit 1
 
     replay_barrier $SINGLEMDS
     local sw=`seq_get_width $label`

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 5fbcac3..21ba352 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -287,6 +287,20 @@ cleanup_krb5_env() {
     fi
 }
 
+mdsdevlabel() {
+    local num=$1
+    local device=`mdsdevname $num`
+    local label=`do_facet mds$num "e2label ${device}" | grep -v "CMD: "`
+    echo -n $label
+}
+
+ostdevlabel() {
+    local num=$1
+    local device=`ostdevname $num`
+    local label=`do_facet ost$num "e2label ${device}" | grep -v "CMD: "`
+    echo -n $label
+}
+
 # Facet functions
 # start facet device options 
 start() {