Fix a merge error in conf-sanity.sh. Using CMDVERBOSE this way was

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index e253076..34ba231 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -21,14 +21,6 @@ init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/local.sh}
 
-FORCE=${FORCE:-" --force"}
-
-if [ "$VERBOSE" == "true" ]; then
-       CMDVERBOSE=""
-else
-       CMDVERBOSE=" > /dev/null"
-fi
-
 gen_config() {
        rm -f $XMLCONFIG
 
@@ -51,33 +43,33 @@ gen_second_config() {
 
 start_mds() {
        echo "start mds service on `facet_active_host mds`"
-       start mds --reformat $MDSLCONFARGS $CMDVERBOSE || return 94
+       start mds --reformat $MDSLCONFARGS  || return 94
 }
 stop_mds() {
        echo "stop mds service on `facet_active_host mds`"
-       stop mds $@ $CMDVERBOSE || return 97 
+       stop mds $@  || return 97 
 }
 
 start_ost() {
        echo "start ost service on `facet_active_host ost`"
-       start ost --reformat $OSTLCONFARGS $CMDVERBOSE || return 95
+       start ost --reformat $OSTLCONFARGS  || return 95
 }
 
 stop_ost() {
        echo "stop ost service on `facet_active_host ost`"
-       stop ost $@ $CMDVERBOSE || return 98 
+       stop ost $@  || return 98 
 }
 
 mount_client() {
        local MOUNTPATH=$1
        echo "mount lustre on ${MOUNTPATH}....."
-       zconf_mount `hostname`  $MOUNTPATH $CMDVERBOSE || return 96
+       zconf_mount `hostname`  $MOUNTPATH  || return 96
 }
 
 umount_client() {
        local MOUNTPATH=$1
        echo "umount lustre on ${MOUNTPATH}....."
-       zconf_umount `hostname`  $MOUNTPATH $CMDVERBOSE || return 97
+       zconf_umount `hostname`  $MOUNTPATH || return 97
 }
 
 manual_umount_client(){
@@ -136,7 +128,7 @@ run_test 0 "single mount setup"
 test_1() {
        start_ost
        echo "start ost second time..."
-       start ost --reformat $OSTLCONFARGS $CMDVERBOSE 
+       start ost --reformat $OSTLCONFARGS 
        start_mds       
        mount_client $MOUNT
        check_mount || return 42
@@ -148,7 +140,7 @@ test_2() {
        start_ost
        start_mds       
        echo "start mds second time.."
-       start mds --reformat $MDSLCONFARGS $CMDVERBOSE 
+       start mds --reformat $MDSLCONFARGS 
        
        mount_client $MOUNT  
        check_mount || return 43
@@ -170,7 +162,7 @@ run_test 3 "mount client twice"
 test_4() {
        setup
        touch $DIR/$tfile || return 85
-       stop_ost ${FORCE}
+       stop_ost --force
        cleanup 
        eno=$?
        # ok for ost to fail shutdown
@@ -184,7 +176,7 @@ run_test 4 "force cleanup ost, then cleanup"
 test_5() {
        setup
        touch $DIR/$tfile || return 1
-       stop_mds ${FORCE} || return 2
+       stop_mds --force || return 2
 
        # cleanup may return an error from the failed 
        # disconnects; for now I'll consider this successful