diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89 index b9a9abb6c5e7a771650f4dde29f6d9477780818c..12d7517aa025eeb31f2af403e088d18eedb0b6ca 100755 --- a/testsuite/expect/test1.89 +++ b/testsuite/expect/test1.89 @@ -61,6 +61,24 @@ if {$affinity == 0} { } send_user "\ntask affinity plugin installed\n" +set force 0 +log_user 0 +spawn $scontrol show partition [default_partition] +expect { + -re "Shared=FORCE" { + set force 1 + exp_continue + } + eof { + wait + } +} +log_user 1 +if {$force == 1} { + send_user "\nWARNING: This test is not compatible with Shared=FORCE\n" + exit 0 +} + # # Build a test program to report affinity by task # diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91 index 150940ac29e64a822aba8725788718ccd29b21a6..d27e71553d432a92aa4fb895c98835cad0429af0 100755 --- a/testsuite/expect/test1.91 +++ b/testsuite/expect/test1.91 @@ -60,9 +60,26 @@ if {$affinity == 0} { send_user "\nWARNING: task affinity not supported on this system\n" exit 0 } - send_user "\ntask affinity plugin installed\n" +set force 0 +log_user 0 +spawn $scontrol show partition [default_partition] +expect { + -re "Shared=FORCE" { + set force 1 + exp_continue + } + eof { + wait + } +} +log_user 1 +if {$force == 1} { + send_user "\nWARNING: This test is not compatible with Shared=FORCE\n" + exit 0 +} + # Identify a usable node set timeout $max_job_delay set node_name ""