diff --git a/testsuite/expect/globals b/testsuite/expect/globals index eb6dfb0016427ad3da22ebcc4f3e8fc657bfc15f..b4de3de6b0e7e017c5d3fc136a3843725fd9c723 100755 --- a/testsuite/expect/globals +++ b/testsuite/expect/globals @@ -714,7 +714,7 @@ proc priority_type {} { catch {close $fd} if {[string length $name] == 0} { - send_user "ERROR: could not identify the switch type" + send_user "ERROR: could not identify the switch type\n" } return $name @@ -1099,7 +1099,7 @@ proc switch_type {} { catch {close $fd} if {[string length $name] == 0} { - send_user "ERROR: could not identify the switch type" + send_user "ERROR: could not identify the switch type\n" } return $name diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59 index 912eab60d3dd6916562e2f827a36c63d2e1f466e..0fcb5192c07a2d1eba4228939b0549ce005cf00f 100755 --- a/testsuite/expect/test1.59 +++ b/testsuite/expect/test1.59 @@ -103,6 +103,10 @@ expect { wait } } +if {$job_id == 0} { + send_user "\nFAILURE: salloc failure\n" + exit 1 +} for {set i 0} {$i<4} {incr i} { set extra "" diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92 index 460abfee1862cd2a0a499edf2899787f484dbf28..3fa98121294be748e5672b37a17d475ee417e868 100755 --- a/testsuite/expect/test1.92 +++ b/testsuite/expect/test1.92 @@ -37,6 +37,7 @@ source ./globals set test_id "1.92" set exit_code 0 set file_bash "test$test_id.bash" +set job_id 0 print_header $test_id @@ -56,6 +57,10 @@ exit 0 set timeout $max_job_delay set salloc_pid [spawn $salloc -N2 -n4 --verbose -t2 $bin_bash] expect { + -re "salloc: Granted job allocation ($number):" { + set job_id $expect_out(1,string) + exp_continue + } -re "More processors requested than permitted" { send_user "\nWARNING: can't test srun task distribution\n" exit 0 @@ -73,6 +78,10 @@ expect { exit 1 } } +if {$job_id == 0} { + send_user "\nFAILURE: salloc failure\n" + exit 1 +} ############################################################################# #