LU-1538 tests: cleanup test output, acc-small

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 2a57914..7397bc5 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2577,6 +2577,10 @@ thread_sanity() {
         lassert 23 "$msg (PDSH problems?)" '(($tstarted && $tmin && $tmax))' || return $?
         lassert 24 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' || return $?
 
         lassert 23 "$msg (PDSH problems?)" '(($tstarted && $tmin && $tmax))' || return $?
         lassert 24 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' || return $?
 

+       [ $tmin -eq $tmax -a $tmin -eq $tstarted ] &&
+               skip_env "module parameter forced $facet thread count" &&
+               tmin=3 && tmax=$((3 * tmax))
+

         # Check that we can change min/max
        do_facet $facet "lctl set_param ${paramp}.threads_min=$((tmin + ncpts))"
        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmax - ncpts))"
         # Check that we can change min/max
        do_facet $facet "lctl set_param ${paramp}.threads_min=$((tmin + ncpts))"
        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmax - ncpts))"