LU-357 racer test cleanup

[fs/lustre-release.git] / lustre / tests / acceptance-small.sh

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 2a52d82..e76985c 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -9,12 +9,12 @@ export OSKIPPED=0
 
 # This is the default set of tests to run.
 DEFAULT_SUITES="runtests sanity sanity-benchmark sanityn lfsck liblustre
-                runracer replay-single conf-sanity recovery-small
-                replay-ost-single replay-dual insanity sanity-quota sanity-sec
-                sanity-gss performance-sanity large-scale recovery-mds-scale 
-                recovery-double-scale recovery-random-scale parallel-scale 
-                lustre_rsync-test metadata-updates ost-pools lnet-selftest
-                mmp"
+                racer replay-single conf-sanity recovery-small
+                replay-ost-single replay-dual replay-vbr insanity sanity-quota
+                sanity-sec sanity-gss performance-sanity large-scale
+                recovery-mds-scale recovery-double-scale recovery-random-scale
+                parallel-scale lustre_rsync-test metadata-updates ost-pools
+                lnet-selftest mmp obdfilter-survey sgpdd-survey"
 
 if [[ -n $@ ]]; then
     ACC_SM_ONLY="${ACC_SM_ONLY} $@"
@@ -31,6 +31,8 @@ fi
 [ "$DEBUG_OFF" ] || DEBUG_OFF="eval lctl set_param debug=\"$DEBUG_LVL\""
 [ "$DEBUG_ON" ] || DEBUG_ON="eval lctl set_param debug=0x33f0484"
 
+export TF_FAIL=$TMP/tf.fail
+
 if [ "$ACC_SM_ONLY" ]; then
     for O in $DEFAULT_SUITES; do
         O=$(echo $O | tr "-" "_" | tr "[:lower:]" "[:upper:]")
@@ -104,18 +106,7 @@ title() {
             esac
         fi
     fi 
-    log "-----============= acceptance-small: "$*" ============----- `date`"
-}
-
-is_sanity_benchmark() {
-    local benchmarks="dbench bonnie iozone fsx"
-    local suite=$1
-    for b in $benchmarks; do
-        if [ "$b" == "$suite" ]; then
-            return 0
-        fi
-    done
-    return 1
+    log "-----============= acceptance-small: "$*" ============----- $(date)"
 }
 
 run_suite() {
@@ -141,11 +132,27 @@ run_suite() {
 
     echo "$suite_script located."
     if [[ ${!suite} != no ]]; then
+        local rc
+        local status
+        local duration
+        local start_ts=$(date +%s)
+        rm -rf $TF_FAIL
         title $suite_name
         log_test $suite_name
         bash $suite_script ${!suite_only}
+        rc=$?
+        duration=$(($(date +%s) - $start_ts))
+        if [ -f $TF_FAIL -o $rc -ne 0 ]; then
+            status="FAIL"
+        else
+            status="PASS"
+        fi
+        echo "Script: $status"
+        log_test_status $duration $status
+
         $CLEANUP
-        $SETUP
+        [ x$suite = xSGPDD_SURVEY ] || $SETUP
+
         eval ${suite}="done"
     else
         echo "Skipping $suite_name"