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 3995d5c..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 obdfilter-survey"
+                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} $@"
@@ -109,17 +109,6 @@ title() {
     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
-}
-
 run_suite() {
     local suite_name=$(echo ${1%.sh} | tr "[:upper:]_" "[:lower:]-" )
     local suite=$(echo ${suite_name} | tr "[:lower:]-" "[:upper:]_")
@@ -162,7 +151,8 @@ run_suite() {
         log_test_status $duration $status
 
         $CLEANUP
-        $SETUP
+        [ x$suite = xSGPDD_SURVEY ] || $SETUP
+
         eval ${suite}="done"
     else
         echo "Skipping $suite_name"