diff --git a/testsuite/expect/globals b/testsuite/expect/globals index 6fc761306e136113044c38fce4374843ce5e1aa8..c019b67736cc7d46338956c22d894d1bb49f8350 100755 --- a/testsuite/expect/globals +++ b/testsuite/expect/globals @@ -2696,3 +2696,37 @@ proc check_node_mem { } { log_user 1 } + +################################################################ +# +# Proc: get_fs_damping_factor +# +# Purpose: get FairShareDampeningFactor configuration parameter +# +# Returns FairShareDampeningFactor +# +################################################################ +proc get_fs_damping_factor { } { + global scontrol number + + log_user 0 + set damp 1 + set scon_pid [spawn -noecho $scontrol show config] + expect { + -re "FairShareDampeningFactor *= ($number)" { + set damp $expect_out(1,string) + exp_continue + } + timeout { + send_user "\nFAILURE: scontrol not responding\n" + slow_kill $scon_pid + set exit_code 1 + } + eof { + wait + } + } + log_user 1 + + return $damp +} diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1 index 062b992a5823d7bcc64678547e774b9e25e6a20d..e75267017793dd1628392ca9948a526ac6ccf57e 100755 --- a/testsuite/expect/test24.1 +++ b/testsuite/expect/test24.1 @@ -39,8 +39,15 @@ set test_id "24.1" set exit_code 0 set test_prog "test$test_id.prog" set matches 0 + print_header $test_id +set damp [get_fs_damping_factor] +if {$damp != 1} { + send_user "Unable to run with FairShareDampeningFactor=$damp (must be 1)\n" + exit 0 +} + # # Delete left-over programs and rebuild them #