Branch: b1_6

move the skip to test-framework.sh
b=12599
i=adilger

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2c0d758..73adfe3 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -98,11 +98,6 @@ setup() {
        echo "done"
 }
 
-skip () {
-        log "$0: SKIP: $TESTNAME $@"
-        [ "$SANITYLOG" ] && echo "$0: SKIP: $TESTNAME $@" >> $SANITYLOG
-
-} 
 
 check_kernel_version() {
        VERSION_FILE=$LPROC/version

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 728f2c5..163470e 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -953,6 +953,11 @@ trace() {
        return 1
 }
 
+skip () {
+        log "$0: SKIP: $TESTNAME $@"
+        [ "$SANITYLOG" ] && echo "$0: SKIP: $TESTNAME $@" >> $SANITYLOG
+} 
+
 pass() {
     echo PASS $@
 }