LU-15152 tests: auster reports wrong testsuite status

[fs/lustre-release.git] / lustre / tests / auster

diff --git a/lustre/tests/auster b/lustre/tests/auster
index 89f15b2..423eec2 100755 (executable)
--- a/lustre/tests/auster
+++ b/lustre/tests/auster
@@ -34,6 +34,7 @@ Run Lustre regression tests suites.
       -l        Send logs to the Maloo database after run
                   (can be done later by running maloo_upload.sh)
       -L        Script language of test suite. Default: bash
+      -N        No setup. Do not setup Lustre prior to executing test suite.
       -h        This help.
 
 Suite options
@@ -70,9 +71,10 @@ reformat=false
 script_lang=bash
 test_logs_dir=/tmp/test_logs/$(date +%Y-%m-%d)/$(date +%H%M%S)
 export HONOR_EXCEPT=
+do_setup=true
 export ${SLOW:=no}
 export ${NAME:=local}
-while getopts "c:d:D:nkf:S:g:Hi:rRslL:hv" opt
+while getopts "c:d:D:nkf:S:g:Hi:rRslL:Nhv" opt
 do
        case "$opt" in
                c) export CONFIG=$OPTARG;;
@@ -91,6 +93,7 @@ do
                s) export SLOW=yes;;
                l) upload_logs=true;;
                L) script_lang=$OPTARG;;
+               N) do_setup=false;;
                h|\?) usage;;
        esac
 done
@@ -126,6 +129,7 @@ print_summary () {
 
 
 setup_if_needed() {
+       ! ${do_setup} && return
        nfs_client_mode && return
        AUSTER_CLEANUP=false
 
@@ -210,27 +214,30 @@ run_suite() {
        [[ ! -f $TF_SKIP ]] || rm -f $TF_SKIP
 
        reset_lustre
+
+       return $rc
 }
 
 run_suite_logged() {
-    local suite_name=${1%.sh}
-    local suite=$(echo ${suite_name} | tr "[:lower:]-" "[:upper:]_")
+       local suite_name=${1%.sh}
+       local suite=$(echo ${suite_name} | tr "[:lower:]-" "[:upper:]_")
 
-    suite_script=$(find_script_in_path $suite_name $LUSTRE/tests)
+       suite_script=$(find_script_in_path $suite_name $LUSTRE/tests)
 
-    if [[ -z $suite_script ]]; then
-        echo "Can't find test script for $suite_name"
-        return 1
-    fi
+       if [[ -z $suite_script ]]; then
+               echo "Can't find test script for $suite_name"
+               return 1
+       fi
 
-    echo "run_suite $suite_name $suite_script"
-    local log_name=${suite_name}.suite_log.$(hostname -s).log
-    if $verbose; then
-        run_suite $suite_name $suite_script 2>&1 |tee  $LOGDIR/$log_name
-    else
-        run_suite $suite_name $suite_script > $LOGDIR/$log_name 2>&1
-    fi
+       echo "run_suite $suite_name $suite_script"
+       local log_name=${suite_name}.suite_log.$(hostname -s).log
+       if $verbose; then
+               run_suite $suite_name $suite_script 2>&1 |tee  $LOGDIR/$log_name
+       else
+               run_suite $suite_name $suite_script > $LOGDIR/$log_name 2>&1
+       fi
 
+       return ${PIPESTATUS[0]}
 }
 
 #
@@ -268,6 +275,14 @@ run_suites() {
                         shift;
                         export ONLY=$(split_commas $1)
                         opts+="ONLY=$ONLY ";;
+                    --suite)
+                        shift;
+                        export SUITE=$(split_commas $1)
+                        opts+="SUITE=$SUITE ";;
+                    --pattern)
+                        shift;
+                        export PATTERN=$(split_commas $1)
+                        opts+="PATTERN=$PATTERN ";;
                     --except)
                         shift;
                         export EXCEPT=$(split_commas $1)