diff --git a/testsuite/expect/inc3.11.7 b/testsuite/expect/inc3.11.7
index a981b8f9d341a778bd4798995cb2460089aa941c..694ba53d942f8829649db4f8fea6926b2bc1768b 100644
--- a/testsuite/expect/inc3.11.7
+++ b/testsuite/expect/inc3.11.7
@@ -198,7 +198,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=PENDING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "Job $job_id is PENDING as expected (Within: inc3.11.7)"
exp_continue
}
-re "JobState=RUNNING" {
@@ -250,7 +250,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=PENDING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "ob $job_id is PENDING as expected (Within: inc3.11.7)"
exp_continue
}
-re "JobState=RUNNING" {
@@ -291,7 +291,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=RUNNING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is RUNNING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "Job $job_id is RUNNING as expected (Within: inc3.11.7)"
exp_continue
}
timeout {
diff --git a/testsuite/expect/inc3.11.8 b/testsuite/expect/inc3.11.8
index 9e28760b0a36680278850e8ee66146698aeb9414..2e00293c1d0c3fe30fd8d66a3780c8288da2663a 100644
--- a/testsuite/expect/inc3.11.8
+++ b/testsuite/expect/inc3.11.8
@@ -141,7 +141,7 @@ proc inc3_11_8 {} {
cancel_job $job_id
exit $ret_code
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.8)"
# Delete the reservation
set ret_code [delete_res $res_name]
@@ -154,7 +154,7 @@ proc inc3_11_8 {} {
# Make the reservation using more cores then free in a node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$host_name CoreCnt=$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.8)"
} else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not (Within: inc3.11.8)\033\[m\n"
set exit_code 1
@@ -170,7 +170,7 @@ proc inc3_11_8 {} {
send_user "\n\033\[31mFAILURE: Reservation can not be created when it should (Within: inc3.11.8)\033\[m\n"
set exit_code 1
} else {
- send_user "\n\033\[32mSUCCESS: Reservation can be created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation can be created as expected (Within: inc3.11.8)"
# Delete the reservation
set ret_code [delete_res $res_name]
}
@@ -178,7 +178,7 @@ proc inc3_11_8 {} {
# Make the reservation using more cores than free at reservation start time
set ret_code [create_res "StartTime=now+300 Duration=60 Nodes=$host_name CoreCnt=$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within 3.11.8)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within 3.11.8)"
} else {
send_user "\n\033\[31mFAILURE: Reservation can be created when it should not (Within: inc3.11.8)\033\[m\n"
set exit_code 1
diff --git a/testsuite/expect/inc3.11.9 b/testsuite/expect/inc3.11.9
index ae2947e319c179b9733782c5e0b6e4936f7e8ed1..cef01feef8d95d2e62279a72c6a9cd2dfd16a98d 100644
--- a/testsuite/expect/inc3.11.9
+++ b/testsuite/expect/inc3.11.9
@@ -138,7 +138,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
# Delete the reservation
set ret_code [delete_res $res_name]
@@ -151,7 +151,7 @@ proc inc3_11_9 {} {
# Make the reservation using more cores then free in a node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.9)"
} else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not (Within: inc3.11.9)\033\[m\n"
set exit_code 1
@@ -171,7 +171,7 @@ proc inc3_11_9 {} {
send_user "\n\033\[31mFAILURE: Reservation can not be created when it should (Within: inc3.11.9)\033\[m\n"
set exit_code 1
} else {
- send_user "\n\033\[32mSUCCESS: Reservation can be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can be created as expected (Within: inc3.11.9)"
# Delete the reservation
set ret_code [delete_res $res_name]
if {$ret_code != 0} {
@@ -183,7 +183,7 @@ proc inc3_11_9 {} {
# Make the reservation using more cores than free at reservation start time
set ret_code [create_res "StartTime=now+300 Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.9)"
} else {
send_user "\n\033\[31mFAILURE: Reservation can be created when it should not (Within: inc3.11.9)\033\[m\n"
set exit_code 1
@@ -204,7 +204,7 @@ proc inc3_11_9 {} {
exit $ret_code
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
if {$core_res_num < 2} {
@@ -225,7 +225,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was not created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was not created as expected (Within: inc3.11.9)"
# Now creating a reservation using first 5 nodes and just 1 core per node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,1 User=$user_name" 1]
@@ -235,7 +235,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
# Submit a batch job: a job using cores available in first 5 nodes
set core_res_num [ expr $cores_per_node / 2 ]
@@ -669,7 +669,7 @@ proc inc3_11_9 {} {
cancel_job $job_id
exit $ret_code
}
- send_user "\nSUCCESS: Reservation can be created as expected (Within 3.11.9)\n"
+ log_info "Reservation can be created as expected (Within 3.11.9)"
set exp_node_cnt [expr {$max_node_inx-$min_node_inx+1}]
set exp_core_cnt [expr {8+$cores_per_node}]
@@ -739,7 +739,7 @@ proc inc3_11_9 {} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS: Reservation has correct nodes, CoreCnt, and CoreIDs.\n"
+ log_info "Reservation has correct nodes, CoreCnt, and CoreIDs."
}
cancel_job $job_id
@@ -812,5 +812,5 @@ proc inc3_11_9 {} {
delete_res $res_name
exit 1
}
- send_user "\nSUCCESS: Reservation can not be created as expected (Within 3.11.9)\n"
+ log_info "Reservation can not be created as expected (Within 3.11.9)"
}
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 877847e3ca2f213d0889c9b6bd34e7565115beb9..0c6fcb45ceccd659fabb697b1ed65563b7266e7e 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -87,7 +87,4 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
send_user "\nFAILURE: Login and slurm user info mismatch\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index 43f918edfd955681f8d71ff065aa0bb8a733ca59..20f65381e59ea9c02bebbeed9fa9b40b56cde3a4 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -67,7 +67,4 @@ if {$debug_get != $debug_set} {
send_user "\nFAILURE: Did not log at proper level ($debug_get != $debug_set)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.100 b/testsuite/expect/test1.100
index 70fffefd905016d7b4205886f3beea8a7b701f22..d852aa897bd646de3dd569fc432d4173be9c6f0f 100755
--- a/testsuite/expect/test1.100
+++ b/testsuite/expect/test1.100
@@ -186,7 +186,4 @@ if {[string compare $tested_layout $expected_layout]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.101 b/testsuite/expect/test1.101
index 59f0ade61d5161fc6e228f382a5bcfc01dd051e4..961bf5e59675a80e2fee424202d46e5c05f8e82f 100755
--- a/testsuite/expect/test1.101
+++ b/testsuite/expect/test1.101
@@ -143,6 +143,5 @@ if {$exec_cnt != $node_cnt} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.102 b/testsuite/expect/test1.102
index 7f04c50472b06a0b4bcf5a3cceb8e25242494618..fbf59c290b1bd273167eb9677652f37d361383db 100755
--- a/testsuite/expect/test1.102
+++ b/testsuite/expect/test1.102
@@ -65,7 +65,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.103 b/testsuite/expect/test1.103
index 57f2c9f68dcb25ea8f98ed62c77677db948fd082..e42a33b3ea4858c1102d8cf4c4cde9c1dfc3522f 100755
--- a/testsuite/expect/test1.103
+++ b/testsuite/expect/test1.103
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.104 b/testsuite/expect/test1.104
index bd80ae8e176932303f8f1f35a07c4316562ebe31..87972cd1048a8d8de3d946f64a86e783432d5ac2 100755
--- a/testsuite/expect/test1.104
+++ b/testsuite/expect/test1.104
@@ -279,6 +279,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm $test_srun $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.105 b/testsuite/expect/test1.105
index f8f3a9a0e2362dc2aca99bf0e5fbd0b1ae0ab1c9..b50ddff204720cf2339438f8b92d361eb6a6903b 100755
--- a/testsuite/expect/test1.105
+++ b/testsuite/expect/test1.105
@@ -92,7 +92,4 @@ if {$job_id == 0} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.106 b/testsuite/expect/test1.106
index 0247345f90f55f9972d0c93079348672b519962c..1c5edb56458ef817f05a31257afee0203022ed4b 100755
--- a/testsuite/expect/test1.106
+++ b/testsuite/expect/test1.106
@@ -72,7 +72,4 @@ if {$time_error == 0} {
send_user "\nTime limit error expected, no worries\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.107 b/testsuite/expect/test1.107
index ec2e5636bcbef419c5d32181faeecb0df001a26c..0e312163cde87acd3066d92217e6a6adfaa6add0 100755
--- a/testsuite/expect/test1.107
+++ b/testsuite/expect/test1.107
@@ -44,9 +44,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.108 b/testsuite/expect/test1.108
index 2f8c06e311003ac5c41e772d0c6ecc77cdb0f945..7367aab6861d969ad2caa530139cf9a59c4350ef 100755
--- a/testsuite/expect/test1.108
+++ b/testsuite/expect/test1.108
@@ -70,7 +70,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.109 b/testsuite/expect/test1.109
index e157b5deec5c9a6af1ef4d31438b9a861502580f..fbd442bb7f34ab0d386f122cac504bbad9484096 100755
--- a/testsuite/expect/test1.109
+++ b/testsuite/expect/test1.109
@@ -72,9 +72,7 @@ if {$invalid_tl == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: job not with DEADLINE status.\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index 9f9a0c1c34f317f8068d9fd57aa5d3f63a3524a2..04cb7f26e9f3b960f0e10f8024ac9e0a203d943d 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -119,7 +119,4 @@ if {[ string compare $short1 $short2 ] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.110 b/testsuite/expect/test1.110
index b346d09459670baff4dc9f1135f1b7eb7ff4a6be..f70145fe94d4eb1ee64345a8bdbd6a47b28ec544 100755
--- a/testsuite/expect/test1.110
+++ b/testsuite/expect/test1.110
@@ -81,7 +81,4 @@ if {[wait_for_job $job_id DONE] != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.111 b/testsuite/expect/test1.111
index 5fbe24511d612dcbd01b31a05a0d252019abe358..07b6e69d0675881f737d39a80089861e6a0fb8fa 100755
--- a/testsuite/expect/test1.111
+++ b/testsuite/expect/test1.111
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.112 b/testsuite/expect/test1.112
index 3035410f62b82b54e2fad981f57eef21952d8172..3385c0a7d55982dde9aed2e102f3e142a34e9e27 100755
--- a/testsuite/expect/test1.112
+++ b/testsuite/expect/test1.112
@@ -94,7 +94,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.113 b/testsuite/expect/test1.113
index 9acb8a4764399e70dfcd2c0cb9ae69933b8a5be0..8d6d45199ebd111115d60bfa48b326d2756e5970 100755
--- a/testsuite/expect/test1.113
+++ b/testsuite/expect/test1.113
@@ -99,7 +99,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.114 b/testsuite/expect/test1.114
index f17ba612e126e4afc9fe45cf614f1335f216ad6a..4e4c3a9a4c4dd6f9a7dbefee603751719d708a8f 100755
--- a/testsuite/expect/test1.114
+++ b/testsuite/expect/test1.114
@@ -131,7 +131,4 @@ for {set inx 2} {$inx < $max_task_cnt} {incr inx 2} {
sleep 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.115 b/testsuite/expect/test1.115
index 5ef0e83760ae2d28a3ab53e4815c4dd0675e3b6f..cd2a4bfe4cdbd68f34ff2dbd6b561e905fd36a8c 100755
--- a/testsuite/expect/test1.115
+++ b/testsuite/expect/test1.115
@@ -73,6 +73,5 @@ print_time
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS: No error reported\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index 50d1d07e7123aa21bf0a0f00370ba2e320caca4b..8e89a91833e8704d30c1cfdc4968f9dcb048d53c 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -79,6 +79,5 @@ if {$ckpt_out == -1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 4559d823593fa82cff02a7fcf58e911c3e649389..807841fbea375fe5f8c076691cd61121040d41a2 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -96,7 +96,4 @@ if {$matches != 1} {
send_user "\nFAILURE: Immediate initiation option failure\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index a8743dc92625830a222342851e8d6829e3bab609..709fb5708ac72f69a30589eeec48b628e2bf9670 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -231,6 +231,5 @@ if { $matches != 1 } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in2 $file_out $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index b88ac843f117e3a7b94c1b6e31b649a9a0479719..845a275e83db6c4c61e5a2134b2e93b401b3b573 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -68,7 +68,4 @@ if {$matches != 2} {
send_user "\nFAILURE: problem with srun wait option matches was $matches\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index 82b3d3a43ed641d9c1570e03b875cf09e9339bf8..b5a616570a1b233c83d4059d1bab5cc4a21db358 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -80,7 +80,4 @@ if {$matches != 1} {
exec $bin_rm -f $scratch_file
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.17 b/testsuite/expect/test1.17
index 50e2932f248392fe18aebc6e6b1ef4dadf708a3e..57603e48f69cf38f4cd4db49b6b6a90c049cce2c 100755
--- a/testsuite/expect/test1.17
+++ b/testsuite/expect/test1.17
@@ -207,6 +207,5 @@ if {$got_sleep_err != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index a1a502fa6baf0c92f026ce2cc70e15a6e124ee7c..d49974d808c50cf9febee3d91b7305e100e0a3a9 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -105,8 +105,5 @@ if {[string compare $licenses ""] != 0} {
# Run a job attempting to get a legitimate license name
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 7991f463c9de814713a3ba729c3c257554608dd8..4e8c7ad48a888b267267521a98e16b4a6051f3ba 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -409,7 +409,4 @@ if {$file_cnt != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index f94f366dbe7500bf72538f99dbff818b02616702..6e022e93577c0b191da60e279b59862132c5fc6a 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -67,7 +67,4 @@ if {$task_cnt != $tasks} {
send_user "$task_cnt != $tasks\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 0cda097c7d3611e8876f6603619e2637b775fd6d..24c206f43d361b7ff1565c982163bbf43fb49d10 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -95,7 +95,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 4cd77d41f356c5469e22911a06ff4da88ffdbc84..7ef9bc2dc27b179db8740cd3d290147a5c91095e 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -83,10 +83,7 @@ if {$matches != 1} {
}
if {[test_front_end]} {
- send_user "\nWARNING: Additional portions of this test are incompatible with front-end systems\n"
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
+ send_user "\nWARNING: Additional portions of this test are incompatible with front-end systems\n"
exit $exit_code
}
@@ -129,7 +126,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index c3666dbd3426c09570bbb4ea27f6269e38a33eaf..1184207fd802c8968bf8a88788884682ca192996 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -108,7 +108,4 @@ if {[string compare $host_0 ""] == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.23 b/testsuite/expect/test1.23
index 07c179f8058ba996ee290214ba39269f1ef6eaba..3e800df017fdddacc396c2c0ff93b8143db87c6e 100755
--- a/testsuite/expect/test1.23
+++ b/testsuite/expect/test1.23
@@ -250,7 +250,4 @@ if {[string compare $this_date ""] == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index a2234c7eba2661281cbbf3c191d390a3ac597f43..b46dd3e9cafc81fe04771f85a0950fac344dbd1c 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -74,8 +74,4 @@ if {$err_msg != 1} {
set exit_code 1
}
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.25 b/testsuite/expect/test1.25
index a1ee5388e77a24ec51533a7d084bd683253ea32c..d509e38f43546e7a68f16597b6049b55b94bc1a3 100755
--- a/testsuite/expect/test1.25
+++ b/testsuite/expect/test1.25
@@ -64,7 +64,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.26 b/testsuite/expect/test1.26
index 2f2b677f3d79a28d03f7bb73f83b678fbea0f84b..daefa48e56565a225c46ff0452b008512fa339c9 100755
--- a/testsuite/expect/test1.26
+++ b/testsuite/expect/test1.26
@@ -265,7 +265,4 @@ if {$successes != $iterations} {
send_user "\nFAILURE: only $successes of $iterations completed successfully\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.27 b/testsuite/expect/test1.27
index bdb2e994f047280c26ee2978d4dc61fc9010c28d..4e3e50f31cb7bcd266ba3986602c0652ec56ecba 100755
--- a/testsuite/expect/test1.27
+++ b/testsuite/expect/test1.27
@@ -123,7 +123,4 @@ if {$good < $total} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.28 b/testsuite/expect/test1.28
index ee97c86c8d0f4661b5ee3b1e5e676afb4b583a62..87f96b76e6f30d21e058b36a438eea7727f39de3 100755
--- a/testsuite/expect/test1.28
+++ b/testsuite/expect/test1.28
@@ -151,6 +151,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index 9a57b2ea028bc711ab18cbad666aee01bd7b17cd..b09fcdc3dfa8616e7eb5173883ad558d403cec2b 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -248,8 +248,7 @@ if {$matches != $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
+ exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index 17b47ae48236d1bc1a4499b427312b46e2a5227a..7554441cc6b79c70f79acf119e9bc95f73e120c3 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper srun version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 12d34446b2a208b87cde5543b1156f78e926f1ca..c237862375598e4a644b5d542cd1861f81a05000 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -94,7 +94,4 @@ if {$error == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.31 b/testsuite/expect/test1.31
index 45fc221ac454520e470c6f54776ffb77ceb47901..20d52d84c48b1c50bdfedcad70807c4268504691 100755
--- a/testsuite/expect/test1.31
+++ b/testsuite/expect/test1.31
@@ -180,6 +180,5 @@ if {$max_node_val > $max_nodes} {
#
if {$exit_code == 0} {
exec $bin_rm -f $env_valu_stdout $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index 0519122da24ff055ab49299cc4e92b1709d689ed..6813d06ae41f3cdb5fcfc26d5e5ad7efb4b3c421 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -134,6 +134,5 @@ if {$fini_cnt != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 4f10cf24a9c9e7de7e9fe2bf2d33673e17115e02..9b618d4657281fc1a60b4dd2a974c0837155678a 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -113,6 +113,5 @@ if {$matches != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $exit_script $test_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index c7cfa1a28102c651bb5d4a81320dddc4ce7b4719..1a490cf9c830d141624269e1397890fa5d928eca 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -86,6 +86,5 @@ if {$matches != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 20433ca7594b55c143462b4fbff71b672553ec19..4be7b2a5ae384d6674b557de88d18b3a5d3c2fe2 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -160,7 +160,6 @@ if {$step_cnt != $steps_started} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index b7afb7cbafb5659677a2a032477eb5dc00b41fc3..d8d640d9c532ab24c21a345b8966a0ff39c6b105 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -67,7 +67,4 @@ if {$task_output != [expr $task_cnt * $mult]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.37 b/testsuite/expect/test1.37
index 44f5f11f1db6ac40dcff7942869834ba7c57b748..70abf423fcb53bf7660c7209bb4bf4755d616f09 100755
--- a/testsuite/expect/test1.37
+++ b/testsuite/expect/test1.37
@@ -77,7 +77,4 @@ if {$task_output != $task_num} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.38 b/testsuite/expect/test1.38
index 4ad5b769d4bfa27686c332b9074c171663c525b8..0d669e39a5b4745b80a370de9971f2c10c6536ee 100755
--- a/testsuite/expect/test1.38
+++ b/testsuite/expect/test1.38
@@ -166,6 +166,5 @@ if {[expr $match_wait + $match_int + $match_term] != 2} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index 81952dcd55de3120f2ee0f90b57f5427fd1c0bd5..c24d37adec2ef102aba0f1edf44c66c2477d84ed 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: srun failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.40 b/testsuite/expect/test1.40
index 1b548dbfba9d900cf8adbba8c5f6c7646300bef7..bbf46c16414fd4e9e04473b23ba7143c8535e7af 100755
--- a/testsuite/expect/test1.40
+++ b/testsuite/expect/test1.40
@@ -162,6 +162,5 @@ if {$match_acct == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.41 b/testsuite/expect/test1.41
index 67e6524acb70e7220a2f5fda7e9e5df63ea84bf0..4be822607b1cb61199cced4a28c848e9f29844eb 100755
--- a/testsuite/expect/test1.41
+++ b/testsuite/expect/test1.41
@@ -95,7 +95,4 @@ if {$task_cnt != $resp_cnt} {
send_user "$task_cnt, $resp_cnt\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.42 b/testsuite/expect/test1.42
index 043d725054d2bf055464c3e60f091f1c5ba6b358..583a3784277cb12b4b0771a2d804c6ce4bb814cc 100755
--- a/testsuite/expect/test1.42
+++ b/testsuite/expect/test1.42
@@ -96,6 +96,5 @@ if {$match_job_state == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.43 b/testsuite/expect/test1.43
index ceb292cfdd75b0fc8dee0a8beaa7f4f34b772a81..eb7577f09f7d00504638a24be08024c1ae387f77 100755
--- a/testsuite/expect/test1.43
+++ b/testsuite/expect/test1.43
@@ -78,7 +78,4 @@ if {$jobs_run == 0} {
send_user "\nError expected. No worries.\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44
index a3cea4c1b94dd39860abd926ef53bbe4ec5896ab..9a22470c7ee9370dcb11b9316da23bfa93df659c 100755
--- a/testsuite/expect/test1.44
+++ b/testsuite/expect/test1.44
@@ -113,7 +113,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
exec $bin_rm -f $file_in $file_out $file_err
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_err $file_in $file_out
} else {
send_user "\nFAILURE\n"
diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45
index eb557d5a3acee0fe67fd18bad13effc9153c8058..a0315a5e19cd7e79bc5250685ac68d6f6f7b8553 100755
--- a/testsuite/expect/test1.45
+++ b/testsuite/expect/test1.45
@@ -149,7 +149,6 @@ if {$num_procs_test3 != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index b2bb91736c3fde1e1abd7fd4c72675fa64f64f33..d7e13935c7815c3874987ec92e00f24543c1c7db 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -101,6 +101,5 @@ if {$matches != 1} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in.c
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.47 b/testsuite/expect/test1.47
index b5f555817ee88b922787351284961645278c2c0b..1b12ea67c2c83ef19b2eb7c8e630df89f2f4d115 100755
--- a/testsuite/expect/test1.47
+++ b/testsuite/expect/test1.47
@@ -100,6 +100,5 @@ if {$matches == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index 9f810156ec1a97b2d8f8442a32dd4bb1afd2d224..f2cb6953fedd0364c2081dffa9c76df1f056c7e2 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -80,7 +80,4 @@ if {$got_job_grps == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.49 b/testsuite/expect/test1.49
index 6b4af25e4169698eb76d8f8257518a989c810fff..87e73cc3d18977718af282445e2fce6505817320 100755
--- a/testsuite/expect/test1.49
+++ b/testsuite/expect/test1.49
@@ -162,6 +162,5 @@ if {$matches != $tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $task_prolog $task_epilog $file_in
exec $bin_rm -f $file_out_pre $file_out_post
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index 91ba41233dc12117dd8edbac1b0cfdb6e2c55eaf..dc33faced42cfabdc6bc94db5775ab0480b6ea15 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -70,7 +70,4 @@ if {$matches < $target_matches} {
send_user "\nFAILURE: srun failed to report help message ($matches of $target_matches)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.50 b/testsuite/expect/test1.50
index 7d2ca41c105641b023924b67e2641fb8edb7426a..b41c1a3512d4244fbf43c37cd7d5e6cd7fa8fb57 100755
--- a/testsuite/expect/test1.50
+++ b/testsuite/expect/test1.50
@@ -87,7 +87,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.51 b/testsuite/expect/test1.51
index 312a2e0debea71c77a67432761c7a680f66626c8..6ac33a2e63d2a93c2352deba90e8b58d9d6ffc2a 100755
--- a/testsuite/expect/test1.51
+++ b/testsuite/expect/test1.51
@@ -82,6 +82,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index 95b131525f2076618d44ebd0be573a99aff5edfe..315dcef00c8d6a1f0c6695cfa3d942266a359477 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -181,6 +181,5 @@ for {set i 0} {$i<3} {incr i} {
if {$exit_code == 0} {
exec $bin_rm -f $hostfile
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index eac795928e88d4526719096ac954c2235a2f1df2..8567c112b9cef63a1af16e1e52aa3b4f4ad22b0d 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -81,7 +81,6 @@ if {$began_flag == 0} {
if {$exit_code == 0} {
exec rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.54 b/testsuite/expect/test1.54
index e9e205f6328dfbfeb0d9cc9f7a9b5659cd97b5aa..2526f767aaf334d529c3c80ced18f89438cc7e87 100755
--- a/testsuite/expect/test1.54
+++ b/testsuite/expect/test1.54
@@ -233,6 +233,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.55 b/testsuite/expect/test1.55
index 5ecb9f31e67b5fad5bd6c790c2108f94ba9fca3d..17e522bf22cf505f4d8407792a9dcbee74660256 100755
--- a/testsuite/expect/test1.55
+++ b/testsuite/expect/test1.55
@@ -138,7 +138,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_script
exit 0
} else {
diff --git a/testsuite/expect/test1.56 b/testsuite/expect/test1.56
index acded9118ee33fc8942beaf67404f6a62fa32976..73f233168ba20d3acc90c4fcf3a7b33143d03697 100755
--- a/testsuite/expect/test1.56
+++ b/testsuite/expect/test1.56
@@ -84,6 +84,5 @@ if {[catch {exec diff $file_in $file_out}]} {
exit 1
}
-send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out
exit 0
diff --git a/testsuite/expect/test1.58 b/testsuite/expect/test1.58
index 4762389d9f01c9389775c0199ae5ec8410d0d1a5..f19ffd9efcbeb6af17f954efc17dad73206c01b7 100755
--- a/testsuite/expect/test1.58
+++ b/testsuite/expect/test1.58
@@ -108,7 +108,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index 30f7932702b3cad314a9fe732a6cb0103175fc5c..178b3dc79d6e2d1e7050f69a777ce99d22a42542 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -415,6 +415,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $hostfile
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 51e30d6f7ed516ddb82e39829264c3bcca202a72..bf922df852f648346f75c914f28c852bfe854090 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -70,7 +70,4 @@ if {$matches != 1} {
send_user "\nFAILURE: srun failed to change working directory\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.60 b/testsuite/expect/test1.60
index fb1f02cd750f79912dd9ced9e365a624638b30c7..7304811144d744d3546ef9fdab404733e8a68091 100755
--- a/testsuite/expect/test1.60
+++ b/testsuite/expect/test1.60
@@ -207,7 +207,4 @@ for {set node_id 0} {$node_id < $node_count} {incr node_id} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.61 b/testsuite/expect/test1.61
index 339cf3152fdbf5fa44c49f8b6941893a12682bde..6741ecf4bee16b1c64e0b19ad876eb8592b9832e 100755
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -124,6 +124,5 @@ if {[wait_for_file $file_err] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.62 b/testsuite/expect/test1.62
index cbeaa8d5406497cd4624e946925916a48215f9e7..31d09e573ab52453d8d41e2e9412e3c8721b43d0 100755
--- a/testsuite/expect/test1.62
+++ b/testsuite/expect/test1.62
@@ -161,7 +161,4 @@ run_gpu_fail "gpu:tesla:INVALID_COUNT"
run_gpu_fail "gpu:INVALID_TYPE:"
run_gpu_fail "gpu:INVALID_TYPE:INVALID_COUNT"
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.63 b/testsuite/expect/test1.63
index fa836fb63c2b39a84ca2a86ca5d673e03f7861b3..4ba7f31f5a718fe46e4f24a9074da9f6f002e612 100755
--- a/testsuite/expect/test1.63
+++ b/testsuite/expect/test1.63
@@ -105,6 +105,5 @@ if {$match_abort < 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.64 b/testsuite/expect/test1.64
index 8d6a5d027db30955f3afba5e32c80a830f3bba10..fde220386bcbef972f75156f4b1de48efb19f3f4 100755
--- a/testsuite/expect/test1.64
+++ b/testsuite/expect/test1.64
@@ -75,7 +75,4 @@ if {$matches != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.65 b/testsuite/expect/test1.65
index 529e58fcc0c7e432fbcf503319806860846c8e4a..cb18f9c5f5bd4d42b06e7d38917a07df6df0949f 100755
--- a/testsuite/expect/test1.65
+++ b/testsuite/expect/test1.65
@@ -64,7 +64,4 @@ if {$matches < $target_matches} {
send_user "\nFAILURE: srun failed to report help message ($matches of $target_matches)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.66 b/testsuite/expect/test1.66
index 19f0a71e6f6acd22f0fcdc94a334a0bda831a5de..dade59d8363a490b46fdbe8bf4590d4d8aca17fd 100755
--- a/testsuite/expect/test1.66
+++ b/testsuite/expect/test1.66
@@ -109,6 +109,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $script $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.67 b/testsuite/expect/test1.67
index 7c55fdfa22a67c3ab479f336ceb20eafd572bf23..053dec8935e4aa647009837f9e1b7bcf39e02814 100755
--- a/testsuite/expect/test1.67
+++ b/testsuite/expect/test1.67
@@ -109,7 +109,6 @@ if {$fini_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test1.68 b/testsuite/expect/test1.68
index 4b9a9a3765574220b5b71ace52f345cd4a74793a..896ab405769c54fcd9cb4cd216a3b10541ecd6df 100755
--- a/testsuite/expect/test1.68
+++ b/testsuite/expect/test1.68
@@ -152,7 +152,6 @@ if {$fini_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in $stop_srun
}
exit $exit_code
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index 0411a02205193810d302ef1cfc30b831c1222c87..e59eb45b9b4bc8edc4ba42b7dc130bc2ab575ea5 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -153,7 +153,6 @@ if {$fini_match != $run_timer} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index a64a6e40b3acbe3129c8037fc403299dc6236232..8837f254759dc9c36b116882d3f29cacde7fac5d 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -180,7 +180,4 @@ if {$completions != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.70 b/testsuite/expect/test1.70
index ee384d4d1ae9ee409828d5302abeee9cf41ac456..752de16446143d482734176f20481b6d703c465d 100755
--- a/testsuite/expect/test1.70
+++ b/testsuite/expect/test1.70
@@ -77,7 +77,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test1.71 b/testsuite/expect/test1.71
index 432cc9b92821cd03f8e6caf42c251a97ac01f7b4..16652d499a7216bc74560530db68af1a49100a74 100755
--- a/testsuite/expect/test1.71
+++ b/testsuite/expect/test1.71
@@ -118,7 +118,6 @@ if {$error_match != 2} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_out $script $file_c
}
exit $exit_code
diff --git a/testsuite/expect/test1.72 b/testsuite/expect/test1.72
index c69227495fcf2cd72cc7a0e1157f8d6ea504c0bb..05cb0c171f91ca34a6cd14a2d445ceabff4b594b 100755
--- a/testsuite/expect/test1.72
+++ b/testsuite/expect/test1.72
@@ -95,7 +95,4 @@ if {$sub_match != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.73 b/testsuite/expect/test1.73
index 9ca6da48a88564e295cc24dbf32bdbe28b22a72c..b9c52a9036b65fcc8964d7f706ee9f07d8a07648 100755
--- a/testsuite/expect/test1.73
+++ b/testsuite/expect/test1.73
@@ -153,6 +153,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $good_script $bad_script $good_job $bad_job
exec $bin_rm -f $conf_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.74 b/testsuite/expect/test1.74
index a94a51330c4e64a1d965aa2d39bbc2b2dbcbb57c..8498a89868da0c30c4d44d644c57f8cd70dcd4d2 100755
--- a/testsuite/expect/test1.74
+++ b/testsuite/expect/test1.74
@@ -314,9 +314,7 @@ srun_test [expr $node_cnt - 2] $acct_c2
cleanup
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.75 b/testsuite/expect/test1.75
index e521c76b9029fd33fedf78d73018653041a780f2..8fd4880e14a7985fec7a407bdd8a7e4cb99a4f84 100755
--- a/testsuite/expect/test1.75
+++ b/testsuite/expect/test1.75
@@ -265,6 +265,5 @@ if { (($freq_lvl_1(low) > $freq_lvl_1(medium)) ||
if {$exit_code == 0} {
exec $bin_rm -f $file_id $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.76 b/testsuite/expect/test1.76
index dd1a24da7df1ea8a9d169ef09f67a6134da4059d..b1747e2d145a514604e9b213a280b69d96bd27ee 100755
--- a/testsuite/expect/test1.76
+++ b/testsuite/expect/test1.76
@@ -391,7 +391,6 @@ if {$nerr != 0} {
send_user "\n\nFAILURE: $nerr test cases failed.\n"
set exit_code 1
} else {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $wd/test1.76.out
}
exit $exit_code
diff --git a/testsuite/expect/test1.77 b/testsuite/expect/test1.77
index 29ccd910cfc626e82a7de0c213a4e9c6446760b0..5919707d23dfb7b4bf43b1559172aa6471b60a4b 100755
--- a/testsuite/expect/test1.77
+++ b/testsuite/expect/test1.77
@@ -72,7 +72,6 @@ if {$found != 1} {
send_user "\nFAILURE: COULD NOT FIND SLURM_JOB_NAME=banana\n"
exit 1
}
-send_user "SUCCESS\n"
#
# Tests -J using sbatch
@@ -112,7 +111,6 @@ if {$found != 1} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "SUCCESS\n"
}
exec rm -f slurm-$job_id.out
@@ -140,5 +138,4 @@ if {$found != 1} {
exit 1
}
exec rm -f $file_in
-send_user "SUCCESS\n"
exit $exit_code
diff --git a/testsuite/expect/test1.8 b/testsuite/expect/test1.8
index c628dd1a3dbf940662965a904c0851e49dd1e59f..c0866fd43c3e413fe61a7ef5e1f07ea164218a60 100755
--- a/testsuite/expect/test1.8
+++ b/testsuite/expect/test1.8
@@ -165,6 +165,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index 3ebbea01e291a287b80d7d78fc494d846d89944c..b493245728ddbce61255b56a4c938dcbb863ea16 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -180,7 +180,4 @@ if {[string compare $tested_layout $expected_layout1] &&
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index 607c5ce81bba901493b05dfbcff4b6605607cecb..3b707d7f4baa8aae454fddb8fde2cbcfc229221a 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -294,7 +294,4 @@ if {$dup_host == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index a7d47604fa210e4a357659a31c8480749dd9340e..0161110eb080587f0935a78caf8b6d843be50ccf 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -243,7 +243,4 @@ if {$dup_hostname == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index d27d1aab38e2ac3215570a3d26f385abd93ca6d0..cba8d4a2c33c452f605202586b6041d5d4f7eaad 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -122,7 +122,4 @@ lappend check_hosts_list $host_0_name $host_1_name $host_2_name
set exit_code [check_hosts_contiguous $partition $check_hosts_list]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index f8bdcf35cf5bd9786c49c3118e0ab891adce0e45..896b02657c7f9e37f0e5997a5d09e95ac91abfe6 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -225,7 +225,4 @@ if {$task_cnt != [expr $cpu_cnt / 2]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.85 b/testsuite/expect/test1.85
index bc201f6bfcaa061881a332cebf8314f9ccd0d3ed..885cb36e4432b05e94aa2ad69121c8bfe2dcb79e 100755
--- a/testsuite/expect/test1.85
+++ b/testsuite/expect/test1.85
@@ -170,5 +170,3 @@ if {[ string compare $host2 $hostname] != 0} {
send_user "\nFAILURE: The execution hostname $hostname != $host2 requested hostname.\n"
exit 1
}
-
-send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index cdfcff230e8d666717d1c64855e4772cef7d4770..bf7b7d65ff31fed3fd481dfaaf3787b9d71ca610 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -515,7 +515,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index db59c822b43b756be5201d54a9e9b63222451cfb..5485572ea542e282e79d68d5964ebef02bce3f7c 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -336,7 +336,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index cac4a5cf5302df1c349efc3f2b0fa34009f358a4..517302ecd8b00c492821c172fd289d8ec4578bba 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -237,7 +237,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index cd3746ac7f2a7f1bbfd57e6d3810b406618c42ff..d8a916c960e520a401bfaeb6192a2ce878849a6f 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -560,7 +560,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration \n"
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 037f652cf5c86fbf1eaf66bcbc89d95f914c5305..74a9d529c000c90021a760f686229288ae58955d 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -77,7 +77,4 @@ if {$verbosity != 1} {
send_user "\nFAILURE: Did not report job id with verbosity on\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index 8d17ec2a59fc4c2dc65ff16e934457fee47c4a7e..d94a2ae43e4a34ac7d3667d1b1c5e47e19a33335 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -587,7 +587,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration\n"
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index 6b1dae4183839e3a054edea11aa388a231b5cb3a..e6b2f5f10ca0a3fc8d38763b4aebcfbac1266e34 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -541,7 +541,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} elseif { [test_fast_schedule] == 2 } {
exec $bin_rm -f $file_prog
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf\n"
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 52a6d7003857ab33ef0837cdd36cba71602a3797..1f96ae31e82419b2244143e2048f87076b4d99a0 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -309,9 +309,7 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration\n"
}
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index d2567e5fdea71413ab1abc44c0c8fbda034ee156..a3ec09935ab445e1aab6de46eb9fed4b860e50d5 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -114,9 +114,6 @@ proc end_test { } {
set_cpu_bind "node" $node_0 $node_cpu_bind_0
set_cpu_bind "node" $node_1 $node_cpu_bind_1
set_cpu_bind "partition" $def_part_name $partition_cpu_bind
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
diff --git a/testsuite/expect/test1.94 b/testsuite/expect/test1.94
index 799fdf5aa0b3dcde6370865b4e1543ab1590b001..b3fc5dcf2a9bc91c735bee105fac20aa0b1091b3 100755
--- a/testsuite/expect/test1.94
+++ b/testsuite/expect/test1.94
@@ -190,7 +190,6 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
exec $bin_rm -f $master_prog ${master_prog}.o
exec $bin_rm -f $slave_prog ${slave_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 23fe752462a53b4661fad8bff06c19f16176a8fa..e5ec556de0fc0eec1a65ab6209f3a1e778b0e619 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -166,7 +166,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
send_user "Check contents of $file_err\n"
}
diff --git a/testsuite/expect/test1.96 b/testsuite/expect/test1.96
index 72538de7d5b05dddb6d74204af06ceedfe6a1137..c5ea9cc01a659969aeb53cc74619c9304c183429 100755
--- a/testsuite/expect/test1.96
+++ b/testsuite/expect/test1.96
@@ -151,7 +151,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
send_user "Check contents of $file_err\n"
}
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index 1074e9a601538214f1dd53e14288b06fa31422ac..9c3a3dfec349fb25e3b5729e876d89e15eb291ce 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -384,6 +384,5 @@ check_tasks_off $ntaskpn [array get tasks] 2
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.99 b/testsuite/expect/test1.99
index e16e2d2f55feaf59ca8fdd66de1cd44fc1314939..8250dc45fba7dce28d219c2502692a6ee23605d7 100755
--- a/testsuite/expect/test1.99
+++ b/testsuite/expect/test1.99
@@ -228,6 +228,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $file_in $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test10.1 b/testsuite/expect/test10.1
index 7b86500493346fb34a83c5a5b1795896e07b9e53..c330611690ee663dfc0ec82fc27b293936204c30 100755
--- a/testsuite/expect/test10.1
+++ b/testsuite/expect/test10.1
@@ -65,7 +65,4 @@ if {$matches != 1} {
send_user "\nFAILURE: smap failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index ac8467cf26edf7d705dff4f2dbf81bf6f36b046a..d3a6cc2034fcf8120b129184c44262127145d878 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -131,7 +131,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.11 b/testsuite/expect/test10.11
index cad078031cd14f551c9b7e67364bc8d7bde46e32..c4304b8be89ea84ccb8f16aa2f3503e10bc83d18 100755
--- a/testsuite/expect/test10.11
+++ b/testsuite/expect/test10.11
@@ -66,7 +66,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper smap version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.2 b/testsuite/expect/test10.2
index 784a698574a330d85a7a197c4cf3df0dc33b4473..0bbc61de86f21fb22798aa485b60c475dcc0a846 100755
--- a/testsuite/expect/test10.2
+++ b/testsuite/expect/test10.2
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: smap failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index bf505dcb353d206da60fba5207fa3862a12dc794..97d5f1eb88f7daae2ecba6067d40ab2b1d63ca5f 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -104,7 +104,4 @@ if {$matches != 6} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index e212b230de5fcf6673f725957d5ffc1a8f527c7d..e7b03211ad93eca44edeb1d0c036bf6ace11a551 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -89,7 +89,4 @@ if {$matches != 5} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.7 b/testsuite/expect/test10.7
index 137e488d1b9546782feeffc38846d86e653a36a2..bada8b12bf93b99fe66b9cb45bb6cbbfa71d559b 100755
--- a/testsuite/expect/test10.7
+++ b/testsuite/expect/test10.7
@@ -117,7 +117,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index 9bb3194fcbc17c0dfd6502422955ea0aea92437a..84a98833a093ff0ecfc35b3d8d9cf424dfd5956d 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -113,7 +113,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index ec7e9c273e7c864ef291fe54902850aa77bb9ede..b5549ca9c7d4e24286cfbfaa0a0cad42f21ecb38 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -88,7 +88,4 @@ if {$matches <= 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.1 b/testsuite/expect/test12.1
index 17504fc06b95c36e32b4e8b0452df152e34d23f8..d287639f7861574f11fffbac9b64817e02de929f 100755
--- a/testsuite/expect/test12.1
+++ b/testsuite/expect/test12.1
@@ -89,7 +89,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index dbd96881c2cfa407669cfa82240f04f49f9d779e..3bcf3dc4a3f90dd2bd8c101bf72e4016ae3027b1 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -115,8 +115,7 @@ proc _get_mem {prog} {
$prog $diff_mem $mem_size $mem_used]
return 1
} else {
- log_info [format "SUCCESS: %s memory use discrepancy of %s KB" \
- $prog $error_mem]
+ log_info [format "%s memory use discrepancy of %s KB" $prog $error_mem]
}
return 0
}
@@ -207,7 +206,7 @@ proc _get_file_size {prog} {
return 1
}
- log_info [format "SUCCESS: %s reported correct written and read file size (file_size:%s MB max_disk_write:%s MB max_disk_read:%s MB)" \
+ log_info [format "%s reported correct written and read file size (file_size:%s MB max_disk_write:%s MB max_disk_read:%s MB)" \
$prog $mb_file_size $max_disk_write $max_disk_read]
return 0
@@ -409,7 +408,7 @@ if {$error_time > $max_time_error} {
$error_time $sleep_time $elapsed_time]
set exit_code 1
} else {
- log_info "SUCCESS: sacct elapsed time discrepancy of $error_time secs"
+ log_info "sacct elapsed time discrepancy of $error_time secs"
}
set total_cpu 0
@@ -438,7 +437,7 @@ if {$total_cpu > $sleep_time} {
$total_cpu $sleep_time]
set exit_code 1
} else {
- log_info [format "SUCCESS: sacct TotalCPU time looks reasonable (%s seconds)" \
+ log_info [format "sacct TotalCPU time looks reasonable (%s seconds)" \
$total_cpu]
}
@@ -468,7 +467,7 @@ if {$min_cpu > $sleep_time} {
$min_cpu $sleep_time]
set exit_code 1
} else {
- log_info "SUCCESS: sacct MinCPU time looks reasonable ($min_cpu seconds)"
+ log_info "sacct MinCPU time looks reasonable ($min_cpu seconds)"
}
if {[_get_mem $sacct] != 0} {
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 78f522874485a747b5ecb4f22815780937ebdbb5..c3034173cf6fbd13ff44d0a08c31f84538931661 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -731,7 +731,4 @@ if {$damatches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.5 b/testsuite/expect/test12.5
index 9f7e79aaeec09d0fe45d365e2d5186bfd3ad01ad..5e87d08394168ec2ba28d0452973e0b1e13b64cc 100755
--- a/testsuite/expect/test12.5
+++ b/testsuite/expect/test12.5
@@ -112,7 +112,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.6 b/testsuite/expect/test12.6
index faf5def02be83579871c73a378ea4a396a2b481e..f6d5a1c1d98881c10bc7a576eea529ec877c4b5a 100755
--- a/testsuite/expect/test12.6
+++ b/testsuite/expect/test12.6
@@ -226,7 +226,6 @@ if {$nerr > 3} {
if {$exit_code == 0} {
exec rm -f $file_prog $file_out $hdf5_file
- send_user "\nSUCCESS\n"
} else {
exec mv $hdf5_file test$test_id.hdf5
}
diff --git a/testsuite/expect/test12.7 b/testsuite/expect/test12.7
index 1a28fce04adbebbb2cf7dae5127eda947b3fd936..81274ca2c995f9d1e01427607ea71bb8edc650a8 100755
--- a/testsuite/expect/test12.7
+++ b/testsuite/expect/test12.7
@@ -52,7 +52,9 @@ proc endit { exit_code msg } {
global job_id bin_rm file_in
cancel_job $job_id
exec $bin_rm $file_in
- send_user "\n$msg\n"
+ if {$exit_code != 0} {
+ log_error "$msg"
+ }
exit $exit_code
}
@@ -395,4 +397,4 @@ if {$comp_count != 2} {
endit 1 "FAILURE: Bad COMPLETED count ($comp_count != 2)"
}
-endit 0 "SUCCESS"
+endit 0 ""
diff --git a/testsuite/expect/test12.8 b/testsuite/expect/test12.8
index 69bd764623fc10ab394a484b7a9fc48454d1a887..f4d9c0ccb69edf65e8ccc250c1929ae4c686ff49 100755
--- a/testsuite/expect/test12.8
+++ b/testsuite/expect/test12.8
@@ -117,7 +117,6 @@ if {$failed_cnt != 2 || $timeout_cnt != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test12.9 b/testsuite/expect/test12.9
index 471a9e6f88f6a7889cab5476c017fad25dd6804f..6d316e691be731b530ca7a2d5081dfc387038e6e 100755
--- a/testsuite/expect/test12.9
+++ b/testsuite/expect/test12.9
@@ -168,5 +168,4 @@ run_sacct "$array1_job_id,$array2_job_id\_3" [expr $expected_steps * 6] $expecte
# Now test sacct one task from the first array and the second full
run_sacct "$array1_job_id\_2,$array2_job_id" $expected_steps [expr $expected_steps * 6]
-send_user "\nSUCCESS\n"
exit $exit_code
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index 937182fdde35d5fa36bdcd172b0a8499d5487d63..2ee9aac2c66a251a08bb1a474f16edd8f4a01f80 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -134,8 +134,5 @@ expect {
}
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 85d4104c49729d126a1b91af97eab480fe1a90b9..4ba526ac183da07fcbe0a05945c1bf552c0a7d9e 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -66,7 +66,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sbcast failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.10 b/testsuite/expect/test14.10
index 67f70b3a7f29d0506713978b532ffe7362532ba2..7a2581f01ed5aa7885939e5c6826bdf9715b0291 100755
--- a/testsuite/expect/test14.10
+++ b/testsuite/expect/test14.10
@@ -162,6 +162,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -rf $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 5eeae55b6ddbdc92e7c10e381e03426dc7cf73aa..12c72ebbb08170fc7b1ccc52b5f7b4ac27dbd127 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -70,7 +70,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sbcast failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index c1106065c37e5690b832b4c4473e39a260a1ae96..160abcad64416ae307a8916320c139e16b781fac 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -67,7 +67,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sbcast version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index d6ca716fbfa9571df592b32aa946b72ab377c140..1ab58e48ae70222726849d1ec48c9acd226a0705 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -142,6 +142,5 @@ if {$differ_found == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 48229e3294168c1e855586dfa1a26e065f09f07b..cee22213ad7328dc225d764730d8464d22f52be9 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -159,6 +159,5 @@ if {$reset == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.6 b/testsuite/expect/test14.6
index ef7bd262d7f3ef32cbb1c0eb146c3c311ecf0ea3..bb80f588ec96cab065205921e4b9bd9c8a464fb4 100755
--- a/testsuite/expect/test14.6
+++ b/testsuite/expect/test14.6
@@ -139,6 +139,5 @@ if {$matches != 4} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index 072fd8622480e14adff53419598d41785502f507..14517dacc7caef46db3be866cb407852734285b7 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
index bea16030877baa8cab9fb2c501145a3e0a112aa4..d967a0481a89ae8e7cc4ae66e293fdb45b15a5b1 100755
--- a/testsuite/expect/test14.8
+++ b/testsuite/expect/test14.8
@@ -138,6 +138,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.9 b/testsuite/expect/test14.9
index 4cab3024e488e1cee24394c66d7fd4510d05c86e..9aa64a9702e1a63551147dd2b0ac72c7fa827c1c 100755
--- a/testsuite/expect/test14.9
+++ b/testsuite/expect/test14.9
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.1 b/testsuite/expect/test15.1
index f92b07b348c05ecdcd7c4284418bd8fc58a23356..2396c3976b1ecaa57373586f22ace27cff54a7f1 100755
--- a/testsuite/expect/test15.1
+++ b/testsuite/expect/test15.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: salloc failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index 983d65ce7b058e9dcb889b141a3f2bb5fbbd77c0..193132b03ca32f48fd20346b355b3d57dd5b89f1 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -79,7 +79,4 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index f9bb9066e402288866c2e5b4637c44643ebe68e2..7c6d33ec3346538edd60156cfdc854131463dc20 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -126,7 +126,4 @@ if {$delta_prio < 950} {
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index e1c2b8102d844b748776d1620f201206fc041406..d88163e9bd97bf171affe28c626c64d2d93edc7b 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -74,7 +74,4 @@ if {$err_msg != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.13 b/testsuite/expect/test15.13
index c21b7fd300f73fa0b48c10980986215da17e22e8..d4ca34df47499326b72b18ee18b6edfc7a58c456 100755
--- a/testsuite/expect/test15.13
+++ b/testsuite/expect/test15.13
@@ -102,7 +102,4 @@ if {$good < $total} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.14 b/testsuite/expect/test15.14
index d89adbdf39aa817b0fc0704b85b3359e06156cd9..c50994eb60a4366a437ff44c4b07755b2178c88f 100755
--- a/testsuite/expect/test15.14
+++ b/testsuite/expect/test15.14
@@ -147,6 +147,5 @@ if {[wait_for_file $file_out2] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.15 b/testsuite/expect/test15.15
index 4d3663952aa1548415e3a6702725ac8c09f1dafa..c16c9912bb9aa0ac3cdd2f28d299a22710e1fa8f 100755
--- a/testsuite/expect/test15.15
+++ b/testsuite/expect/test15.15
@@ -102,7 +102,4 @@ if {$job_id == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.16 b/testsuite/expect/test15.16
index c6b53a53d64885c3dba210b9b67ca471b05798c4..f9b94dbac0f356962035b1df1450ddf2991d2dd0 100755
--- a/testsuite/expect/test15.16
+++ b/testsuite/expect/test15.16
@@ -108,7 +108,4 @@ if {$job_id == 0} {
#
# Post processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.18 b/testsuite/expect/test15.18
index 1791128fee51a733d430a4c6a73cbcabc65f3da0..1325269f2d3fc7fba1813ebe9ae909f1ef1c11f7 100755
--- a/testsuite/expect/test15.18
+++ b/testsuite/expect/test15.18
@@ -76,7 +76,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index 32ea4639dbf82457e8ff8f735879911a6a1ef4a1..6dab0bbdeede9e0a7d11f81b975b6b1f2aa6c7e3 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -252,9 +252,6 @@ set partition [default_partition]
set node_count [get_node_cnt_in_part $partition]
if { $node_count < 2 } {
send_user "WARNING: Insufficient nodes in default partition to continue ($node_count < 2)\n"
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
@@ -338,7 +335,4 @@ if {$dup_host == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.2 b/testsuite/expect/test15.2
index b7ec732f159f03f0e4617cd84f63bca38608cf6b..eec356e9e994773a1ef1cc401bf3e20e88dfc9fd 100755
--- a/testsuite/expect/test15.2
+++ b/testsuite/expect/test15.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: salloc failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index 07839dbad62f920a451700b3d79c099eb9ca98bd..71b2d5373da6a46b2478ce59ac1317af8a167d29 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -271,7 +271,4 @@ if {$dup_hostname == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.21 b/testsuite/expect/test15.21
index 183cc9ce7d440592356e6ee1944320eb50db21a9..edf29cd12ff7fcdb9ce4fb4f0dd5393ef5812b42 100755
--- a/testsuite/expect/test15.21
+++ b/testsuite/expect/test15.21
@@ -131,8 +131,4 @@ lappend check_hosts_list $host_0_name $host_1_name $host_2_name
set exit_code [check_hosts_contiguous $partition $check_hosts_list]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
-
exit $exit_code
diff --git a/testsuite/expect/test15.22 b/testsuite/expect/test15.22
index f14d2901fb9319d62dbf8e61bfd8f58e5bcd631c..d5aa2eb92dd4e0dbc656b392e86bd9c89b3460b4 100755
--- a/testsuite/expect/test15.22
+++ b/testsuite/expect/test15.22
@@ -185,7 +185,4 @@ if {$legit_failure == 1} {
cancel_job $job_id
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24
index 8ec78e3a34144d9745bf977b1aab1c085d5eca63..2b15e969f542e623af57bb1c0cdb9ae2f770c8b8 100755
--- a/testsuite/expect/test15.24
+++ b/testsuite/expect/test15.24
@@ -93,6 +93,5 @@ if {$task_cnt != $tasks} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.25 b/testsuite/expect/test15.25
index 43fdef1e29d9365727f8b2912669471a42c9632f..92ed327b3540d239229cf24d05e1315e1fb66cba 100755
--- a/testsuite/expect/test15.25
+++ b/testsuite/expect/test15.25
@@ -139,6 +139,5 @@ if {$match_acct == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.26 b/testsuite/expect/test15.26
index da3c090d4305d18fd3b64043040a6b1a7caee275..c113b374bbfaf2f08cd8955c3339397dae56469d 100755
--- a/testsuite/expect/test15.26
+++ b/testsuite/expect/test15.26
@@ -79,7 +79,4 @@ if {[expr $wait_flag + $abort_flag] != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.27 b/testsuite/expect/test15.27
index c30dfcff2df6c2c7ffe0214a8ccee1e08b4c9390..c06c215c92c7385ef8c73a7faa3ff9b46b75c220 100755
--- a/testsuite/expect/test15.27
+++ b/testsuite/expect/test15.27
@@ -169,7 +169,4 @@ expect {
check_alloc
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.3 b/testsuite/expect/test15.3
index f7ae067b877ca3d1da3415403e114f34c7dfaafc..3464296888275fe6299d146052a0ac44525cd33b 100755
--- a/testsuite/expect/test15.3
+++ b/testsuite/expect/test15.3
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper salloc version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.30 b/testsuite/expect/test15.30
index 0db813af802680a2b5efb78455f76092dd8636d8..914ba08b5a10dab27a7a1ab52af701719526d594 100755
--- a/testsuite/expect/test15.30
+++ b/testsuite/expect/test15.30
@@ -61,7 +61,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.31 b/testsuite/expect/test15.31
index d583aa0f0cd57cbe986822b7be45e27800171cec..6cc0441792bed060f41a1b44ba216d5eea8b9ef9 100755
--- a/testsuite/expect/test15.31
+++ b/testsuite/expect/test15.31
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.32 b/testsuite/expect/test15.32
index 047de7a60f0c7cfe5b88906bed97c79b9e8ce442..bc85c3505ff5316fbe91aefbced6d9425b48af95 100755
--- a/testsuite/expect/test15.32
+++ b/testsuite/expect/test15.32
@@ -279,6 +279,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm $test_salloc $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.33 b/testsuite/expect/test15.33
index 1cfaf873ff1d37b650ba7f5a9b206d2c1d3c12f2..7abc8b70cdf789ba3f276bd92f80dcce8e5e46b1 100755
--- a/testsuite/expect/test15.33
+++ b/testsuite/expect/test15.33
@@ -97,7 +97,4 @@ if {$job_id != 0} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.34 b/testsuite/expect/test15.34
index 7f844cdb88fa72ab2d2fede90072a7048ed5041c..87c0ece682445d3c1da986f5dd91a6249c4593b8 100755
--- a/testsuite/expect/test15.34
+++ b/testsuite/expect/test15.34
@@ -65,7 +65,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.35 b/testsuite/expect/test15.35
index 98d276052129f5372fcfee6e0850dd9d1099d6b0..9b4a7aced69f9e9d90e2c1060b50670521f77ae4 100755
--- a/testsuite/expect/test15.35
+++ b/testsuite/expect/test15.35
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.36 b/testsuite/expect/test15.36
index e140f174cccc8d367ef4f5496af73740c75a33e8..1c7cd2ff96993d78ce179e5db5328b53d4298df4 100755
--- a/testsuite/expect/test15.36
+++ b/testsuite/expect/test15.36
@@ -70,7 +70,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.37 b/testsuite/expect/test15.37
index 20ca0c7359c54b19245c3c448c3a39b645051538..57afeb202341e94c8bb72a1cc58d79708d87b1ae 100755
--- a/testsuite/expect/test15.37
+++ b/testsuite/expect/test15.37
@@ -149,7 +149,4 @@ if {$exit_code == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.38 b/testsuite/expect/test15.38
index af6c04beff2e467440c33d6554bb6b29e2a453f5..8b3f96f1d7b2a94c36ce134bef11d569a3dfc6e3 100755
--- a/testsuite/expect/test15.38
+++ b/testsuite/expect/test15.38
@@ -126,7 +126,4 @@ if {$not_support != 0} {
exit 0
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.39 b/testsuite/expect/test15.39
index bd42a949c5ab2b7c77447554a448a460983bb2b3..4a77dc6f110da0c27cf4676efcd907614ef1813d 100755
--- a/testsuite/expect/test15.39
+++ b/testsuite/expect/test15.39
@@ -106,7 +106,4 @@ if {$job_id == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4
index a4bbf20e13eabbd8449955623cc37f9cc12c365a..ffe28764cb6fbdbec5402c40f66b1f41238b9160 100755
--- a/testsuite/expect/test15.4
+++ b/testsuite/expect/test15.4
@@ -95,7 +95,4 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
send_user "\nFAILURE: Login and slurm user info mismatch\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index ccd410b860da210827726e6e347be3415818877f..6315962cc5629ebcf3d9a20568657d476c8f302a 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -183,6 +183,5 @@ if {$completions != 1} {
if {$exit_code == 0} {
file delete $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.6 b/testsuite/expect/test15.6
index 0a4df0b7fa5314ed2d8817d1084ee4e710c4dd56..9b8c394bbc19d173990ca08b97c22f2d7b8ce9dd 100755
--- a/testsuite/expect/test15.6
+++ b/testsuite/expect/test15.6
@@ -87,7 +87,4 @@ if {$verbosity != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.7 b/testsuite/expect/test15.7
index dc46375dbd095d5bd71c6a46e96ef1b0742ca22d..7951ac4b6c419e2358e00d8212fb21b70e175952 100755
--- a/testsuite/expect/test15.7
+++ b/testsuite/expect/test15.7
@@ -133,7 +133,4 @@ if {$matches != 5} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.8 b/testsuite/expect/test15.8
index 6f571df8c2034ee64f303b2e7ade65e8788806aa..c69281affdd5e6eec9c14bdc8e056513e085bc70 100755
--- a/testsuite/expect/test15.8
+++ b/testsuite/expect/test15.8
@@ -114,7 +114,4 @@ if {$matches != 1} {
send_user "\nFAILURE: Immediate initiation option failure\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index 6df9e80a0ce3ab4e389199b69474a5fb4fd01127..7447e146710cda3ee8d8395c7727c4eed96f8246 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -104,7 +104,4 @@ if { $match != 1 } {
set exit_code 1
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.1 b/testsuite/expect/test16.1
index 8f1fd4d5cbd15850efaa2d26ea764a4fa04f9ad0..1f1b1c9eb4ab3018894f8441482e247a419e6940 100755
--- a/testsuite/expect/test16.1
+++ b/testsuite/expect/test16.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sattach failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.2 b/testsuite/expect/test16.2
index 677f16b27bc34c0189cf572cc4e3260faf876d60..ccc7d7fa237814cc9be58665ecf5856b83dbf1f8 100755
--- a/testsuite/expect/test16.2
+++ b/testsuite/expect/test16.2
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sattach failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.3 b/testsuite/expect/test16.3
index dfed410be9dfb413f12bc14a17412259a78087ac..a5512d2bd30ebc61e5898ebc1af07500d34b6a24 100755
--- a/testsuite/expect/test16.3
+++ b/testsuite/expect/test16.3
@@ -62,7 +62,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sattach version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.4 b/testsuite/expect/test16.4
index c3fa7e8443eb3e9be8fd05fc23de5c814ca9b697..3bbb0831c7166372192a57f48ae54ffab116c330 100755
--- a/testsuite/expect/test16.4
+++ b/testsuite/expect/test16.4
@@ -206,7 +206,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
cancel_job $job_id
}
diff --git a/testsuite/expect/test17.1 b/testsuite/expect/test17.1
index 8e5ec80ccf6e75f8bade0fb13ad4b1a47e50aedd..51b6a91db27d756eae789db31120d5b077bd39d7 100755
--- a/testsuite/expect/test17.1
+++ b/testsuite/expect/test17.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sbatch failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.10 b/testsuite/expect/test17.10
index ef38fce973f38db7992512dc436a1b79b4c25558..64a3f0fcf9e13b2c7da4b4e80be38c99db302f97 100755
--- a/testsuite/expect/test17.10
+++ b/testsuite/expect/test17.10
@@ -138,6 +138,5 @@ if {[cancel_job $job_id] != 0} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.11 b/testsuite/expect/test17.11
index a56b57ad215b5ed86b6a4dd80d79baf764128622..8ef9ea0b76eb8a5c925d0dcb8e65942121e637ef 100755
--- a/testsuite/expect/test17.11
+++ b/testsuite/expect/test17.11
@@ -179,6 +179,5 @@ if {$force_part == 0 && $match_oversubscribe != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index f3cb0e777dc25c3013d01a34ec86e01506c273ab..c4a13b09de442c071944b34176647d7ff0c51956 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -1037,7 +1037,6 @@ clean_up
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.13 b/testsuite/expect/test17.13
index 965006aa98862c7ee4aee15bfb18f125b6f7dc03..e08fd77e1bfbaf167d4f76ec68b140c415190060 100755
--- a/testsuite/expect/test17.13
+++ b/testsuite/expect/test17.13
@@ -140,6 +140,5 @@ if {$good < $total} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.14 b/testsuite/expect/test17.14
index 23a04f0cc2a1b07eb499bed3360366cfc826ea90..bcff73505c4e9958be92733cb77aec161bcc4e11 100755
--- a/testsuite/expect/test17.14
+++ b/testsuite/expect/test17.14
@@ -293,6 +293,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index 5e2948f6d41fcc15ce3f909e86cf2fc11dc9ba43..735285519d7dd5faa9697d30562f10ed543a6a05 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -234,8 +234,6 @@ if {$matches != $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
-
+ exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test17.16 b/testsuite/expect/test17.16
index 3cb0b8c6bb49b2e8b147aa9a0cdf8152f2f9783d..020170c2816cb82d0425237ccbf5f45242a3762f 100755
--- a/testsuite/expect/test17.16
+++ b/testsuite/expect/test17.16
@@ -107,7 +107,6 @@ if {$arg_match == 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index 6f50dd4b7c73312dd1e5545056df2ca8ace72cdc..1decaccbb38c063f16aadb2e24a47f12913dc3dd 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -148,6 +148,5 @@ if {$waited == 0} {
cancel_job $job_id1
if {$exit_code == 0} {
exec $bin_rm -f $file_err $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.18 b/testsuite/expect/test17.18
index cf640619ac7064fc16ab6a85bf383ccea5a18227..f85a8a1d49de3076caf833f35e757f6cb1dd4900 100755
--- a/testsuite/expect/test17.18
+++ b/testsuite/expect/test17.18
@@ -275,6 +275,5 @@ if {$purged_job == 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.19 b/testsuite/expect/test17.19
index 48a794a5a504f09e4bc1051a97bfd2b361a95db3..4c8a50e4c3a5eca7795569f6fd7b25abd8760ad3 100755
--- a/testsuite/expect/test17.19
+++ b/testsuite/expect/test17.19
@@ -162,7 +162,6 @@ send_user "\n\nSo far, so good....\n\n\n"
if {$part_cnt < 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
}
diff --git a/testsuite/expect/test17.2 b/testsuite/expect/test17.2
index d048d7e857727f1cec88c42049a3b81029bcd180..caa647627fa16794a1334cadc982841d165c26a4 100755
--- a/testsuite/expect/test17.2
+++ b/testsuite/expect/test17.2
@@ -64,7 +64,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sbatch failed to report help message ($matches != 2)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.20 b/testsuite/expect/test17.20
index dbb3bef83529cd646822315cd8d39da8d19be320..2c77b48a6e586100fc76de3faa113d8281a2fc79 100755
--- a/testsuite/expect/test17.20
+++ b/testsuite/expect/test17.20
@@ -109,6 +109,5 @@ if {$got_job_grps == 0} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.21 b/testsuite/expect/test17.21
index caa2397dea985dc86d272bb13bf263ef923794c8..df5398ac054ed1ce7904db35069ea87c8db8fa67 100755
--- a/testsuite/expect/test17.21
+++ b/testsuite/expect/test17.21
@@ -161,6 +161,5 @@ expect {
#
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.22 b/testsuite/expect/test17.22
index 6365b0ffa6419b8879df45db0aef11d39ed40021..319345feca26c2ed870f83f2b5d9b7b5902e9280 100755
--- a/testsuite/expect/test17.22
+++ b/testsuite/expect/test17.22
@@ -67,7 +67,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.23 b/testsuite/expect/test17.23
index 0ab7c3363defeee3967c5c0516dd3653da876b8b..641c9e275885412fe2cf97899fe9fd3cd1df3077 100755
--- a/testsuite/expect/test17.23
+++ b/testsuite/expect/test17.23
@@ -186,8 +186,5 @@ if {$job_prio1 == 0 || $job_prio2 == 0 || $job_prio3 == 0} {
cancel_job $job_id1
cancel_job $job_id2
cancel_job $job_id3
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.24 b/testsuite/expect/test17.24
index cf9a9942d05be19dabc8c6850abd66cdde7cf38b..7dc668ce2fe0571dfc24e9ffe1ed28061083c6ba 100755
--- a/testsuite/expect/test17.24
+++ b/testsuite/expect/test17.24
@@ -114,6 +114,5 @@ if { $matches != 2 } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.25 b/testsuite/expect/test17.25
index e937e61e0ebb800f145c38424679fdfdb91fb034..69538f19ac09e80d5c7c415217a25a593b0a4b75 100755
--- a/testsuite/expect/test17.25
+++ b/testsuite/expect/test17.25
@@ -105,6 +105,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.26 b/testsuite/expect/test17.26
index 63141b312bf8ad0bdf5e6175416c1a539297e3b1..721cfb3173a61c9b494acbdd1f525683866f4b43 100755
--- a/testsuite/expect/test17.26
+++ b/testsuite/expect/test17.26
@@ -92,6 +92,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.27 b/testsuite/expect/test17.27
index adb9e1a33cb768f74079c7ef2c8feef4a129d5a6..77ca21ef3fae91ef32fb2a352abbc8a501f66a22 100755
--- a/testsuite/expect/test17.27
+++ b/testsuite/expect/test17.27
@@ -306,6 +306,5 @@ if {$dup_hostname == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.28 b/testsuite/expect/test17.28
index ab49f3788f23c2ae366aaba25b79b69829e9b304..6f217ffd1ea4c35e13eaa2bbf0ded866744214c0 100755
--- a/testsuite/expect/test17.28
+++ b/testsuite/expect/test17.28
@@ -185,6 +185,5 @@ if {[wait_for_job $job_id DONE] != 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.29 b/testsuite/expect/test17.29
index b57cb7b26f5a1b0a3a19e80cc68dfdfdb6a85e56..2682c11b01e4b94290e20b1ee88c2d0cb3800b7c 100755
--- a/testsuite/expect/test17.29
+++ b/testsuite/expect/test17.29
@@ -107,7 +107,6 @@ if {$arg_match == 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test17.3 b/testsuite/expect/test17.3
index 824682b45ebf5f17bde7adf3487778c5f6c0ad20..e95d0b16aba8c7de90e0fe33f1ca188982699276 100755
--- a/testsuite/expect/test17.3
+++ b/testsuite/expect/test17.3
@@ -62,7 +62,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sbatch version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.31 b/testsuite/expect/test17.31
index 0e23b4f6ce73c6ef891ee4c2df8fee4069835079..e5900e9f4793aa406037cdbe49edcd08cdf6be68 100755
--- a/testsuite/expect/test17.31
+++ b/testsuite/expect/test17.31
@@ -170,6 +170,5 @@ if {$job_id != 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32
index f26634224bb11674290b5b7b696f97eb312ef6ad..096cf4c80d24c075d0126167d53a0f033a0e78ce 100755
--- a/testsuite/expect/test17.32
+++ b/testsuite/expect/test17.32
@@ -116,6 +116,5 @@ if {$tasks != $task_cnt} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.33 b/testsuite/expect/test17.33
index 668954b537236ad0b3e8c1e9b47a29e92b92dc7c..9cba448caf1b3f5ed73201eb3bf6328762842175 100755
--- a/testsuite/expect/test17.33
+++ b/testsuite/expect/test17.33
@@ -214,6 +214,5 @@ if {$got_sleep_err != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.34 b/testsuite/expect/test17.34
index da18b812b7fe80ecfa15dab17974ccfe01c6b4ec..d941d6d982301a209685f079b2c25cdea8a197d3 100755
--- a/testsuite/expect/test17.34
+++ b/testsuite/expect/test17.34
@@ -286,7 +286,6 @@ core_spec_job 1 $first_node [expr $core_cnt + 5] -1
core_spec_job 1 $first_node [expr $core_cnt + 7] -1
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $spec_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.35 b/testsuite/expect/test17.35
index dc136e09ccaf3aa7b6542cfdcd5a43dac3be993c..e78c3f6b19bf640a3c65b58e1d7e167ee1700233 100755
--- a/testsuite/expect/test17.35
+++ b/testsuite/expect/test17.35
@@ -117,7 +117,6 @@ if {$rate < $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.36 b/testsuite/expect/test17.36
index 962c8e80d05384f39e732ac5e199fcfc973ab56c..53708c4f14562049678d063f6a49fc789008ebd0 100755
--- a/testsuite/expect/test17.36
+++ b/testsuite/expect/test17.36
@@ -435,7 +435,6 @@ delete_part $test_part_3
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.38 b/testsuite/expect/test17.38
index fec662e2f4465883a39e9443bdc5c915407da428..3b23dfcb1ff230996403373651fc1e32d7206ae6 100755
--- a/testsuite/expect/test17.38
+++ b/testsuite/expect/test17.38
@@ -239,6 +239,5 @@ expect {
if {$exit_code == 0} {
exec rm -f $file_prog $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.39 b/testsuite/expect/test17.39
index 5aed90c1915a9195b83d0faaf6fa69336a16420d..ea3fcbe7eb62e215b4d22a698f88ffbb49b5a58f 100755
--- a/testsuite/expect/test17.39
+++ b/testsuite/expect/test17.39
@@ -162,7 +162,4 @@ cancel_job $fast_id
cancel_job $slow_id
cancel_job $dep_id
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.4 b/testsuite/expect/test17.4
index ab337805bb8f48b04573f8c1a930aa0f2d9b7369..ff05efda3e50f443d24c1404e60a8800a01ce635 100755
--- a/testsuite/expect/test17.4
+++ b/testsuite/expect/test17.4
@@ -120,6 +120,5 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.40 b/testsuite/expect/test17.40
index 08e6e96c34b50267d291ab592e020d866644bf7a..5b64818d9fc00e59e824dea3aab056d832d39124 100755
--- a/testsuite/expect/test17.40
+++ b/testsuite/expect/test17.40
@@ -281,7 +281,6 @@ thread_spec_job 1 $first_node [expr $thread_cnt + 1] -1
thread_spec_job 1 $first_node [expr $thread_cnt + 3] -1
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $spec_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.41 b/testsuite/expect/test17.41
index 2e81e1b98046cba7ec6c6f1167ed510e578ee5d4..3d6e368ff16fb9bf41e28ef0cf70268c1acb2f87 100755
--- a/testsuite/expect/test17.41
+++ b/testsuite/expect/test17.41
@@ -112,7 +112,6 @@ test_sbatch "$test_part\,$test_part\g"
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.42 b/testsuite/expect/test17.42
index ed06f6b1b66edd715c607039ed2c50eb03eb14e5..ee29fa62c933bd2f5193df321c99ae108e479a5e 100755
--- a/testsuite/expect/test17.42
+++ b/testsuite/expect/test17.42
@@ -87,6 +87,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.43 b/testsuite/expect/test17.43
index e2a4c5cd7367c621fce1c29bac470fa427159972..5d54d970ece6b0a604cbd16c2998e02fcc2a3d3c 100755
--- a/testsuite/expect/test17.43
+++ b/testsuite/expect/test17.43
@@ -176,6 +176,5 @@ if {[wait_for_file $file_out] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.44 b/testsuite/expect/test17.44
index beef9996a99b1c5140c103506cfced0adfdfc624..5ffbda354ee7e69c379a68745b419f1131552ee9 100755
--- a/testsuite/expect/test17.44
+++ b/testsuite/expect/test17.44
@@ -123,7 +123,6 @@ for {set task_id 1} {$task_id <= $tasks} {incr task_id} {
if {$exit_code == 0} {
exec $bin_rm -f $script1 $script2
- send_user "\nSUCCESS\n"
} else {
cancel_job $job_id1
cancel_job $job_id2
diff --git a/testsuite/expect/test17.45 b/testsuite/expect/test17.45
index fd764fdf8ec17cf014ea8a7f5ac49dc129e8d7b7..723438519328bf88e1da9e4bfd9db5ecc42260ba 100755
--- a/testsuite/expect/test17.45
+++ b/testsuite/expect/test17.45
@@ -121,6 +121,5 @@ if {[wait_for_file $file_out] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_bbf $file_script $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 926bc171b2465a066e8c3281e47d4746e93d3a86..3de716e3912ddae3c4713807259969a868b21f35 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -405,6 +405,5 @@ if { [file exists $file_err2] } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.51 b/testsuite/expect/test17.51
index a9ef8166df2f7a475e4db706963c4ce9c06d94e9..17f873b1777ae02cdc5b9c17aecf4c54b9d2b561 100755
--- a/testsuite/expect/test17.51
+++ b/testsuite/expect/test17.51
@@ -705,6 +705,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.52 b/testsuite/expect/test17.52
index 346227c9a4fe4d6cf53d5e43aa2f724f8fe9198c..f46e7bf40db46ead257d3842a56b78482af8d050 100755
--- a/testsuite/expect/test17.52
+++ b/testsuite/expect/test17.52
@@ -406,6 +406,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.53 b/testsuite/expect/test17.53
index 38a5f22e8699a8bff767b21958fc7950fc75e1b3..21d9ee465716938332b61bb07dbd78f5f2c19123 100755
--- a/testsuite/expect/test17.53
+++ b/testsuite/expect/test17.53
@@ -75,6 +75,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.54 b/testsuite/expect/test17.54
index c37cbf7726207205c0efa0996eb07a6849c8d2ab..03c26e32b0d3c3b30f7de856c5db4482e84deeaf 100755
--- a/testsuite/expect/test17.54
+++ b/testsuite/expect/test17.54
@@ -157,6 +157,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.55 b/testsuite/expect/test17.55
index 21695d3bc96503fba7a8f5a357716893968265f7..089feed3dda1ff445e2e46355b85c1b354a32c54 100755
--- a/testsuite/expect/test17.55
+++ b/testsuite/expect/test17.55
@@ -256,6 +256,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.56 b/testsuite/expect/test17.56
index 543d3b5decf4b0e21fe2a006028d8353f38f684b..3be3ab2094f4fdc3a2cd0b0ad2786e636b066537 100755
--- a/testsuite/expect/test17.56
+++ b/testsuite/expect/test17.56
@@ -108,6 +108,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.57 b/testsuite/expect/test17.57
index 1f4af8a71bb914842d889d966728cf38530f000b..e80fdddd4bdbae2ace5ba49085779529558ab12b 100755
--- a/testsuite/expect/test17.57
+++ b/testsuite/expect/test17.57
@@ -75,6 +75,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.58 b/testsuite/expect/test17.58
index fb5e2b63ce9eb2d3672032ac710f265ee6656672..c93900a453371788661d4d1905fdde34e4ad422b 100755
--- a/testsuite/expect/test17.58
+++ b/testsuite/expect/test17.58
@@ -47,7 +47,6 @@ proc endit { } {
reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
diff --git a/testsuite/expect/test17.59 b/testsuite/expect/test17.59
index 13378f615d31ea203aaecfc266d00de3e9f7bb23..720e62fdabd23ad2bee9942ae993abc8d5a6603c 100755
--- a/testsuite/expect/test17.59
+++ b/testsuite/expect/test17.59
@@ -79,6 +79,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index d71a2ad8c909dd5c03ffe316cbf1d7a94bcb8882..c19a58a6c2a650e388579091bf588e41908b8dfb 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -161,6 +161,5 @@ if {$task_cnt != $tasks} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.60 b/testsuite/expect/test17.60
index fdac0fe782a2dec4cda6b6a47b57ed6982decdbf..3712475febfbeef075a0da7b52d4377fa781f4b7 100755
--- a/testsuite/expect/test17.60
+++ b/testsuite/expect/test17.60
@@ -137,6 +137,5 @@ if {$exit_code == 1} {
send_user "\nFAILURE: batch submitted with a deadline too short\n"
} else {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.61 b/testsuite/expect/test17.61
index 1b56fee09579c316a21bf03db3da838d3a148de8..ab1009629b648ad21971b11303bc5b8dc04b487e 100755
--- a/testsuite/expect/test17.61
+++ b/testsuite/expect/test17.61
@@ -131,6 +131,5 @@ if {$not_support != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.62 b/testsuite/expect/test17.62
index 6711c1e359b84d528e5e5871eb4ff1f95de4d9c2..bd0a7d775f503f9307154493fbbabb421468a14d 100755
--- a/testsuite/expect/test17.62
+++ b/testsuite/expect/test17.62
@@ -131,6 +131,5 @@ foreach option [array names check_list] {
cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -fr $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.63 b/testsuite/expect/test17.63
index 9ad9c91081b09a5576afdb61f5e2ab54a2d61da3..7c0add033770b061ecc055684862abbe7c29d9ca 100755
--- a/testsuite/expect/test17.63
+++ b/testsuite/expect/test17.63
@@ -151,6 +151,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_script $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.64 b/testsuite/expect/test17.64
index 24314841f7ab323ea88c032ee7b6c4efbdbc025a..216ae2ce919927e80613514bb26e3cb0d9eaa936 100755
--- a/testsuite/expect/test17.64
+++ b/testsuite/expect/test17.64
@@ -404,6 +404,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.8 b/testsuite/expect/test17.8
index 5bf2313cb4d21b2f50e3543d2c52a476cbf344ff..c403ed4aef93d7042b320d6d92a83f1f11ed234e 100755
--- a/testsuite/expect/test17.8
+++ b/testsuite/expect/test17.8
@@ -50,7 +50,6 @@ proc endit { } {
reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
diff --git a/testsuite/expect/test17.9 b/testsuite/expect/test17.9
index 086a539d11cf62fba4d26e4b1ea61f8a4f92b735..24cb7ff59cdf32171c3bf74c1d2255faf6cd73d3 100755
--- a/testsuite/expect/test17.9
+++ b/testsuite/expect/test17.9
@@ -92,6 +92,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.1 b/testsuite/expect/test19.1
index 740bbc1e50381a8100aebb76ba551bed7bd80f87..b8fef24a963cd48a08bc607e9bf1e2df5c4c9483 100755
--- a/testsuite/expect/test19.1
+++ b/testsuite/expect/test19.1
@@ -61,7 +61,4 @@ if {$matches < 2} {
send_user "\nFAILURE: strigger failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test19.2 b/testsuite/expect/test19.2
index 4cec33dec12f2fcb399b054a58e094b9cf80826b..abdc5e3c80167fb576af5d92c71d003d9cfcfa47 100755
--- a/testsuite/expect/test19.2
+++ b/testsuite/expect/test19.2
@@ -57,7 +57,4 @@ if {$matches < 1} {
send_user "\nFAILURE: strigger failed to report usage message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index 3f5602f318fd070ceceecfdf21b6af01072864ee..d240157e095581c9fd4aabc5b2ad52f862c2f306 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -121,7 +121,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index c8ed12d22b08069d34540659f610b4ec5d11f513..2193de002a1493a26d73557bf6fbfae656f6064c 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -161,7 +161,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index e3d5d7fd0d78a0a4db7c26881f7c056f062db6cc..42bae3f2977e10cce77856f64404e2d7c796dc93 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -243,7 +243,6 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_fini $file_in_time
exec $bin_rm -f $file_out_fini $file_out_time
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index 984cb3cbb2c639831cd2045bc3c9e7fe9a7182f5..e3fa1eaa45bc8d0698b89681b3fefda4a40e51ae 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -409,7 +409,6 @@ if {$node_matches != 0} {
cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_fini $file_in_time $file_in_up $file_in_down $file_in_reconfig
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index bbad42e2ee95b53659203bb73cfdd2a09f654b53..4c91603f2d84252330ef4fee8f635f5c907472b9 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -185,7 +185,6 @@ if {$idle_matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_idle $file_out
- send_user "\nSUCCESS\n"
}
# clear any vestigial triggers
exec $strigger --clear --quiet --user=$uid
diff --git a/testsuite/expect/test19.8 b/testsuite/expect/test19.8
index ed16302c870d285606faa694f0b53349de5ecef1..d8e73d921c1e00a00e33ee4b721f05a44559a6f6 100755
--- a/testsuite/expect/test19.8
+++ b/testsuite/expect/test19.8
@@ -137,7 +137,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $trigger_file_in $trigger_file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test19.9 b/testsuite/expect/test19.9
index 09c60ae7c5ee5aa892d5c1f9590da3573ad69344..696801e10334e6d824b0025f4eff1dba71cde59f 100755
--- a/testsuite/expect/test19.9
+++ b/testsuite/expect/test19.9
@@ -117,7 +117,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $trigger_file_out $trigger_file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test2.1 b/testsuite/expect/test2.1
index 3d715b4f3d41ee0b1f8c94b49ca1094327c5bc97..d79de0a3827463f9fc8c0ef6d9ef44213b4700b7 100755
--- a/testsuite/expect/test2.1
+++ b/testsuite/expect/test2.1
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper scontrol version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
index f1b342597b82dcdd108495bb7eda7fb17f0ba446..30d357cdb1958e150f03b347df2d319673d12322 100755
--- a/testsuite/expect/test2.10
+++ b/testsuite/expect/test2.10
@@ -83,7 +83,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index c1d5ffab16e9309ec9738fbb5b570e2fdee302bd..9a2bcecb823f0cbc4a73d19d734b3209d3aa62a9 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -116,7 +116,6 @@ if {$matches != 3} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test2.12 b/testsuite/expect/test2.12
index 3ed97b0a0c892a195653121d4bd4b66f8f4339f9..68ddd6b138803e43ea1d5dadd29349085e7d96dc 100755
--- a/testsuite/expect/test2.12
+++ b/testsuite/expect/test2.12
@@ -106,7 +106,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.13 b/testsuite/expect/test2.13
index ef1866b2d6a757971c4785587a92f59d21f5d097..849f0a11c61aa102fbabdbe7b8bdb28da62582dc 100755
--- a/testsuite/expect/test2.13
+++ b/testsuite/expect/test2.13
@@ -181,7 +181,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.14 b/testsuite/expect/test2.14
index a8fccee703cca2913349b156e351d558fd101d81..695c956841ddb01b067b830d47d1294a4449a153 100755
--- a/testsuite/expect/test2.14
+++ b/testsuite/expect/test2.14
@@ -158,6 +158,5 @@ if {$node_count != 3} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.15 b/testsuite/expect/test2.15
index 201f802ae717869138f50f24f317baf98ac06dee..83c179c8fd25cf39e800f3c55aa70a0fcb4721a6 100755
--- a/testsuite/expect/test2.15
+++ b/testsuite/expect/test2.15
@@ -154,6 +154,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.16 b/testsuite/expect/test2.16
index 05895e258b9be94a490af566be775983b4ab5587..5e7984973ab1ee2443b68d4020a4b866f8070931 100755
--- a/testsuite/expect/test2.16
+++ b/testsuite/expect/test2.16
@@ -219,7 +219,4 @@ check_part DenyAccounts none
#
delete_part
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.17 b/testsuite/expect/test2.17
index 345a631863eef6a3ff0a4b46b24816a8135a6da5..b30aa030adb7882e27ef4415d205237b033c1709 100755
--- a/testsuite/expect/test2.17
+++ b/testsuite/expect/test2.17
@@ -221,8 +221,4 @@ check_part DenyQos none
#
delete_part
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index b7ea99e688e293ac563114ef8dfe6ef1f7e5a4a6..459c205cfa67839158bb600d63cde482b38cd901 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -286,7 +286,4 @@ if {[cleanup] != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index c9d99b8e9bc175addb8f7b59d6b23db9668cda2e..f8f1d64490f7566312d31454fbc36d8c334ad4ce 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -314,7 +314,4 @@ if {[cleanup] != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.2 b/testsuite/expect/test2.2
index 5ed0f05b911cfae32cc3de7bc1bc32dfce159df9..67616e0655ccdacc31c4823ff5a23953cd5b073b 100755
--- a/testsuite/expect/test2.2
+++ b/testsuite/expect/test2.2
@@ -69,7 +69,4 @@ if {$matches != 3} {
send_user "\nFAILURE: scontrol help message not as expected\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.20 b/testsuite/expect/test2.20
index 86a9a4fae1d990b06f048a7f1be02d1186c5f552..66f901c8b11136c739a42e2e80b63c7d3cd55d90 100755
--- a/testsuite/expect/test2.20
+++ b/testsuite/expect/test2.20
@@ -156,7 +156,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.21 b/testsuite/expect/test2.21
index e6a693b325e89938bedb6eb45b2540da8cc28c43..ac576ba7e62e61e89e1c99ab705cc5f6f25b0c82 100755
--- a/testsuite/expect/test2.21
+++ b/testsuite/expect/test2.21
@@ -146,7 +146,6 @@ check_job_state $job_id PENDING|RUNNING
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $complete_script $fail_script
}
exit $exit_code
diff --git a/testsuite/expect/test2.22 b/testsuite/expect/test2.22
index 82b28b72312221bbe72d8e4fad6deef796fceeb6..4037b71deab01b22ac54b6cb037a2d41098480d4 100755
--- a/testsuite/expect/test2.22
+++ b/testsuite/expect/test2.22
@@ -160,7 +160,6 @@ check_release $job_id
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $script
}
diff --git a/testsuite/expect/test2.23 b/testsuite/expect/test2.23
index 1c4e5d6b706eb953686c367b2fbfa4f2a10e2327..0d5d2c03dc713c60e2f49eaf6bb80fd827d8613b 100755
--- a/testsuite/expect/test2.23
+++ b/testsuite/expect/test2.23
@@ -130,7 +130,6 @@ check_release $job_id
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $script
}
diff --git a/testsuite/expect/test2.24 b/testsuite/expect/test2.24
index 23db9659ba70bae5ad72b367f445c882240b6e73..bdb79b8e443d7ca60b50a72a5c3a5215d64d5a66 100755
--- a/testsuite/expect/test2.24
+++ b/testsuite/expect/test2.24
@@ -159,7 +159,6 @@ if {$tot_match != $opt_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $new_conf
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.25 b/testsuite/expect/test2.25
index 657827a3b843a6b759a2703457547d74e9c49d39..40065ab1bfd2ed17397be3e379192e7511cb6671 100755
--- a/testsuite/expect/test2.25
+++ b/testsuite/expect/test2.25
@@ -334,7 +334,4 @@ if {[test_using_slurmdbd]} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.26 b/testsuite/expect/test2.26
index a46410e3085517b34e271ab5326acfcc6ff605ca..44d0ee125b46fdfbeac26bcfd0e4595b4afbeb98 100755
--- a/testsuite/expect/test2.26
+++ b/testsuite/expect/test2.26
@@ -195,6 +195,5 @@ if {$prio(0) <= $prio(1) || $prio(0) <= $prio(2)} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
end_it
diff --git a/testsuite/expect/test2.3 b/testsuite/expect/test2.3
index d1985e6e04e35ca7d3d5590899d06213a5c1984e..664045cc64fb8f761ded4ffb43a301d664206389 100755
--- a/testsuite/expect/test2.3
+++ b/testsuite/expect/test2.3
@@ -65,7 +65,4 @@ if {$matches != 1} {
send_user "\nFAILURE: scontrol ping output error ($matches != 1)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index 610b0fefe55f0eb6ccfc2a63ecb2d1d6ae69be9c..ac54d3c938e43d01ba9db696e9aac0b8c83d35b7 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -166,7 +166,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index 2cb7a630f3b89d4ccdcc71fb5bb6e40f31f2e206..569d21193149f40d2f78d811885c06bf394c56ba 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -248,7 +248,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.6 b/testsuite/expect/test2.6
index 9833713032856f74e6ca73d5b6d2eac870f46efe..3533074fe6d229396681bede02df5e3fba318a5f 100755
--- a/testsuite/expect/test2.6
+++ b/testsuite/expect/test2.6
@@ -92,7 +92,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index d647a070c40039ab9c324092639be1a0e81526c4..6ced27f7b27be85a14c2fd5894f4f10bab6ef95f 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -134,7 +134,6 @@ if {$job_id != $scontrol_id} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index cf71849002cc446cbcc6b0e1fbbeede8c6d48113..7f778dea6f1d4933e25f26a89269154f1602c4d2 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -65,9 +65,6 @@ proc end_it {code} {
cancel_job $job_id2
}
exec $bin_rm -f slurm-$job_id1.sh $test_id.sh
- if {$code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $code
}
diff --git a/testsuite/expect/test2.9 b/testsuite/expect/test2.9
index eb5d32c5c8ab7c7ee21ea1c878660ead54cd6c13..bfd9af3b42bd0dcb1549030a53e6063768f4e8ab 100755
--- a/testsuite/expect/test2.9
+++ b/testsuite/expect/test2.9
@@ -56,7 +56,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.1 b/testsuite/expect/test20.1
index 9a507daf83cf41c7995fc749c52ea1ab45b13d90..3606b67be81750b781252bd1c67c0a726011529a 100755
--- a/testsuite/expect/test20.1
+++ b/testsuite/expect/test20.1
@@ -112,6 +112,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.10 b/testsuite/expect/test20.10
index 8040855b0270eb1fc6bc09d88214d2244d4a4b2a..a450764c59e1a61203dabac3795a20c16d021707 100755
--- a/testsuite/expect/test20.10
+++ b/testsuite/expect/test20.10
@@ -60,7 +60,4 @@ if {$found != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.11 b/testsuite/expect/test20.11
index bb4c4a8db9f5a6e9b8e95b52b9ba9d299bed110f..eeb50d9ee023d766d687487ab5072d7126a65d42 100755
--- a/testsuite/expect/test20.11
+++ b/testsuite/expect/test20.11
@@ -84,6 +84,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.12 b/testsuite/expect/test20.12
index 16f2959ebc2681c9ec2bacdcf3ea2b6a488dc794..a3fd336f88a412b968f5622755a0d969af3076ee 100755
--- a/testsuite/expect/test20.12
+++ b/testsuite/expect/test20.12
@@ -165,5 +165,4 @@ set var2_name "${var1_name}_2"
run_qsub $var1_name "another_value" $var2_name $variable2_value \
"-V -v $var1_name=another_value" "#SBATCH --export=NONE"
-send_user "\nSUCCESS\n"
exit 0
diff --git a/testsuite/expect/test20.13 b/testsuite/expect/test20.13
index ea579d798c295016282b5ea5512c6ed18d9c1be2..65edf74da895fbd64de07452376e316b21c28434 100755
--- a/testsuite/expect/test20.13
+++ b/testsuite/expect/test20.13
@@ -222,6 +222,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.2 b/testsuite/expect/test20.2
index 672efba7a3632a4c2fb6ffa65d67da4674223911..95655d77a57405f1346219474cbf8ea77c10c3d4 100755
--- a/testsuite/expect/test20.2
+++ b/testsuite/expect/test20.2
@@ -98,6 +98,5 @@ catch {exec $qdel $job_id}
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.3 b/testsuite/expect/test20.3
index bf2b76dacb33160f84fae58f548d4fd920f95303..1d6a87dd12d7f51b8c50b55a0c846cddb613f7ec 100755
--- a/testsuite/expect/test20.3
+++ b/testsuite/expect/test20.3
@@ -120,6 +120,5 @@ if {($matches != 0) || ($status == 0)} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.4 b/testsuite/expect/test20.4
index 70293abe9da5b0ecf42e22b8da87c41e8d776237..596cb89924011812344e6871b244e2837c0b16dc 100755
--- a/testsuite/expect/test20.4
+++ b/testsuite/expect/test20.4
@@ -62,7 +62,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.5 b/testsuite/expect/test20.5
index 6cfc0492074d8e4c6826448c9b9583d4bb7cd665..fff748e3df5fd32b5c6c158859090e2e0531b9c7 100755
--- a/testsuite/expect/test20.5
+++ b/testsuite/expect/test20.5
@@ -60,7 +60,4 @@ if {$found != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.6 b/testsuite/expect/test20.6
index 0e2ec4fcbb87719fd730692daea9d52c70a7a0a2..07e88b521c1015f14ae3dc5acf9d951e214bb5c0 100755
--- a/testsuite/expect/test20.6
+++ b/testsuite/expect/test20.6
@@ -129,6 +129,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.7 b/testsuite/expect/test20.7
index be1c4757c864439945984689182c0b9eaf8140e0..0f4d4874c2528cfc539de86d77b97549a31a7a11 100755
--- a/testsuite/expect/test20.7
+++ b/testsuite/expect/test20.7
@@ -121,6 +121,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.8 b/testsuite/expect/test20.8
index 3b374e4f24e2976bac73a374355c44e8a5184e97..42b05f0baa988f9cca8c0db4996a456b1f8d67b6 100755
--- a/testsuite/expect/test20.8
+++ b/testsuite/expect/test20.8
@@ -114,6 +114,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.9 b/testsuite/expect/test20.9
index 12522111b6a5b6ffcb417b755c736cf4d9062d5e..ae10e84c59d6110022686c5fe763921bc3f046b6 100755
--- a/testsuite/expect/test20.9
+++ b/testsuite/expect/test20.9
@@ -84,6 +84,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.1 b/testsuite/expect/test21.1
index 616e42725857c455996534680d243262eb33f7fa..085d851ffdc0315e24e1e1c6e1c2b5593a0a6956 100755
--- a/testsuite/expect/test21.1
+++ b/testsuite/expect/test21.1
@@ -71,7 +71,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 9926bf79fed643fac397dcdf1610eede31f34cd4..ecf020723b431a4ad28ea8f232336f5c0869f6b3 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -297,7 +297,4 @@ if { ![check_acct_associations] } {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index f4fe6437c795434c5ee09de42a36c4c2414cf9d9..5142225d9659047e92067d32fac5371f6597adf6 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -235,9 +235,7 @@ incr exit_code [remove_user "" "" "$us1,$us2,$us3"]
incr exit_code [remove_acct "" "$nm1,$nm2,$nm3"]
incr exit_code [remove_cluster "$tc1,$tc2,$tc3"]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.2 b/testsuite/expect/test21.2
index 2e953a70cbdd279c95086e90415cf0644e1e4eb6..7b2b937133fd0656db9b27e9bd2e948a836cd3ee 100755
--- a/testsuite/expect/test21.2
+++ b/testsuite/expect/test21.2
@@ -71,7 +71,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.29 b/testsuite/expect/test21.29
index c8b5c0ad2a872acac4328097ac5f7bcb0e219106..ac0e5dfc68adf1f8e7cfe7b4eed48243c0f5720d 100755
--- a/testsuite/expect/test21.29
+++ b/testsuite/expect/test21.29
@@ -111,9 +111,7 @@ set exit_code [check_qos_limits $qos_name [array get qos]]
# Next is clean up and the end
incr exit_code [remove_qos "$qos_name"]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.3 b/testsuite/expect/test21.3
index e1ddc669591d352d21a0fb03d91f92dc293470df..8029b6d188eaaef586f0c3052b7273522a13fe2f 100755
--- a/testsuite/expect/test21.3
+++ b/testsuite/expect/test21.3
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.31 b/testsuite/expect/test21.31
index 4180a4bfd5257b58be0ee147217a0e30824aa1d4..4d0261fed80e28bb2824250cacc5ab47f30f8a3d 100755
--- a/testsuite/expect/test21.31
+++ b/testsuite/expect/test21.31
@@ -277,9 +277,7 @@ if {[check_resource_limits $sr3 [array get resource2_chck]] == 1} {
incr exit_code [remove_res $sr2,$sr3]
incr exit_code [remove_cluster $tc2]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.32 b/testsuite/expect/test21.32
index edc40a446440b575b441d688359641f89d742d61..7566915a2ed14e47d29dee8567514b17068c4132 100755
--- a/testsuite/expect/test21.32
+++ b/testsuite/expect/test21.32
@@ -201,8 +201,6 @@ check_pre " "
remove_qos $qos_names_str
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test21.33 b/testsuite/expect/test21.33
index e90cba6f232cc6b52347c4fa25dc101e575c3bdb..fd908f5364399cf4be9d4b409ac2f78afca07f32 100755
--- a/testsuite/expect/test21.33
+++ b/testsuite/expect/test21.33
@@ -226,9 +226,7 @@ if {$match != 0} {
remove_cluster $test_cluster
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.36 b/testsuite/expect/test21.36
index ce505860b261b174a2784a0c2bfc2386c33a9870..6f8909346057ce26c955b68add0d6018eec9cc15 100755
--- a/testsuite/expect/test21.36
+++ b/testsuite/expect/test21.36
@@ -63,9 +63,7 @@ proc endit { } {
global exit_code bin_rm sql_query sql_query_rem
cleanup
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test21.37 b/testsuite/expect/test21.37
index 7cefdb15774b73c3b49a928bd3b648f68f48aea6..74dfa28a3a4e9a198535e9a16d94213e443f04c2 100755
--- a/testsuite/expect/test21.37
+++ b/testsuite/expect/test21.37
@@ -91,7 +91,4 @@ if {$matches != 6} {
send_user "\nFAILURE: sacctmgr show stats response bad ($matches != 6).\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.4 b/testsuite/expect/test21.4
index db713b79d8a2727cae5fb587dbfb266e16f0adc0..a42302f87a80e0d4ca027be2ec01208f95438ac2 100755
--- a/testsuite/expect/test21.4
+++ b/testsuite/expect/test21.4
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index f9b8d83c2478c7e0e6a8bc9eb41f6c7f94d80956..6a83de5631a2d511b0a5595c22f6e57e24619d97 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -639,9 +639,7 @@ if {$exit_code == 0} {
exec $bin_rm -f $sql_rem_clus1
exec $bin_rm -f $sql_in_clus2
exec $bin_rm -f $sql_rem_clus2
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
} else {
diff --git a/testsuite/expect/test22.2 b/testsuite/expect/test22.2
index cc3df7f37d323b026a8e7e9513f4b6e3ab5f13ff..6f18048a76712172ab3c698c847605298ac15c51 100755
--- a/testsuite/expect/test22.2
+++ b/testsuite/expect/test22.2
@@ -318,7 +318,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 5d05bf7639b438b76088bfcea3d31022e644b44e..4a6b82e7e129401904789d28d3d08fb379c99939 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -191,9 +191,4 @@ if {$matches != 1} {
send_user "\nsstat --version test GOOD!\n"
}
-
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index b98dee7b471d5a4c9d7a36f579d2e4fe5e1ed209..20eafcaaf266d2c5d9bd60e59921814cf3f34eea 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -659,6 +659,5 @@ if {$damatches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index ac465d9c3ccaa71c3a68a2e88ed057606587b961..c6183f0e4fb44d21d5e8a1f67d630e1f9650c405 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -138,6 +138,5 @@ if {$matches != 13} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.2 b/testsuite/expect/test24.2
index b8c36191755f1d68b9fcf8c3b9848647b64e64fc..b923ea937dc5e4ed68f9e339e16d0699c90ff9c6 100755
--- a/testsuite/expect/test24.2
+++ b/testsuite/expect/test24.2
@@ -395,11 +395,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- send_user "\nFAILURE
-
-\n"
+if {$exit_code != 0} {
+ send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.3 b/testsuite/expect/test24.3
index 09c8f6d6e4243418e34af1a277f3b38872d2373f..3de1d742d47e0dbb4bb359fb860aa1a912d2701a 100755
--- a/testsuite/expect/test24.3
+++ b/testsuite/expect/test24.3
@@ -180,6 +180,5 @@ if {$matches != 22} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.4 b/testsuite/expect/test24.4
index 4722df5e911faf95dc53115f9fa86e48b2310538..0db7844d7437e964395d0b82a49f6c2e7162539b 100755
--- a/testsuite/expect/test24.4
+++ b/testsuite/expect/test24.4
@@ -240,6 +240,5 @@ if {$matches != $expected_matches} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test25.1 b/testsuite/expect/test25.1
index de35184ddb804e8b2b968529a02d2f9bdfe3d403..76074d7910eca1a733f3635f2104ef0ce2ead6d3 100755
--- a/testsuite/expect/test25.1
+++ b/testsuite/expect/test25.1
@@ -718,6 +718,5 @@ cancel_job $jobid2
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test27.1 b/testsuite/expect/test27.1
index 653913da6c3fa4c2f390bccff720f5a671a78822..875736ebe591dc162daa6b19600e8f3d60f10993 100755
--- a/testsuite/expect/test27.1
+++ b/testsuite/expect/test27.1
@@ -59,7 +59,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.2 b/testsuite/expect/test27.2
index 04e09cc3b0e38f37bcf86343970506469e94af27..adb9153ad8b1d8355047e5bc9cc3896aad6f0b12 100755
--- a/testsuite/expect/test27.2
+++ b/testsuite/expect/test27.2
@@ -63,7 +63,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.3 b/testsuite/expect/test27.3
index 1f3750ae3048b6ff8f4257c684348dac0258f42a..10fdddab1695bbe5f8d7a6e6724ae2be87c6b405 100755
--- a/testsuite/expect/test27.3
+++ b/testsuite/expect/test27.3
@@ -59,7 +59,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.4 b/testsuite/expect/test27.4
index 52088cd4488ed5de65ad9837e59a67372e0c5a69..d8cf9923a5cd3b6fe9adb6017cee097ad3c2278e 100755
--- a/testsuite/expect/test27.4
+++ b/testsuite/expect/test27.4
@@ -99,7 +99,4 @@ if {$jobs_started <= $start_begin} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.5 b/testsuite/expect/test27.5
index f0c98a5f20e4288010379fbe20153567e18977d3..3fa062a048e508178daeb3fbede1df7398be5230 100755
--- a/testsuite/expect/test27.5
+++ b/testsuite/expect/test27.5
@@ -97,7 +97,4 @@ if {$jobs_started != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test28.1 b/testsuite/expect/test28.1
index dbef6f9d6fe126648d2541567eadf43534f3824c..1fa8fe764d137235e27ebadccdd9fd9610a1ce32 100755
--- a/testsuite/expect/test28.1
+++ b/testsuite/expect/test28.1
@@ -202,6 +202,5 @@ scontrol_check $job_id
if {$exit_code == 0} {
file delete $file_in $file_out $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.10 b/testsuite/expect/test28.10
index d23f99b2e44d66c47243cc6ef6992083136368aa..32a59f624285f331b3d5a20fcb3ecc72063a4dcd 100755
--- a/testsuite/expect/test28.10
+++ b/testsuite/expect/test28.10
@@ -125,6 +125,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.12 b/testsuite/expect/test28.12
index 99b4689fd9d831f1cd406fda093f8ff26a094401..b72a5206e6e8ede150c139b81e63563c327df719 100755
--- a/testsuite/expect/test28.12
+++ b/testsuite/expect/test28.12
@@ -113,6 +113,5 @@ if {$match != 1} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.13 b/testsuite/expect/test28.13
index b4c909c0314e4f86d709db86778ae874eb8ec791..282eb996eeddcf2d9e86dc8db7adcd734dc7852f 100755
--- a/testsuite/expect/test28.13
+++ b/testsuite/expect/test28.13
@@ -139,6 +139,5 @@ if {$match != 3} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.2 b/testsuite/expect/test28.2
index 14bc0c22d5d1f9919e2dd797c510a69f641b4872..547f8ecf52053e0d4530b5c9b675a23eb915fca1 100755
--- a/testsuite/expect/test28.2
+++ b/testsuite/expect/test28.2
@@ -217,7 +217,6 @@ for {set index 0} {$index < $array_end} {incr index} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
delete_file
} else {
send_user "\nFAILURE\n"
diff --git a/testsuite/expect/test28.3 b/testsuite/expect/test28.3
index 2401b7ca5e7e0ae36d1a3f492014e395d20e1db9..997ff397e95dc0853c0959093913f870ff7b85c3 100755
--- a/testsuite/expect/test28.3
+++ b/testsuite/expect/test28.3
@@ -101,6 +101,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.4 b/testsuite/expect/test28.4
index 75c527c295eecc1e9496438bbf7b5c8ab43f5df6..915b9c44118bb6f2f22d7d9aec5f091ee4961dbd 100755
--- a/testsuite/expect/test28.4
+++ b/testsuite/expect/test28.4
@@ -142,6 +142,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.5 b/testsuite/expect/test28.5
index dda201f53b033b746b50c7467272b1dbac243b34..1674a69c7942541fb5cc4a89c32ba6ef4d551497 100755
--- a/testsuite/expect/test28.5
+++ b/testsuite/expect/test28.5
@@ -191,6 +191,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.6 b/testsuite/expect/test28.6
index 3849145b802b172720704d311b18aadc086f211d..33a49c1de24be9a37a12fa0ba28b4ba0a6ddcd36 100755
--- a/testsuite/expect/test28.6
+++ b/testsuite/expect/test28.6
@@ -182,6 +182,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.7 b/testsuite/expect/test28.7
index 553370614c9927c96ded78652b9b7aa8b8afd206..dcce46ab1912a3a3ba1694fa38ceec4ed854cb68 100755
--- a/testsuite/expect/test28.7
+++ b/testsuite/expect/test28.7
@@ -144,6 +144,5 @@ if {$match_job_state != $array_size} {
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.8 b/testsuite/expect/test28.8
index 85d283c7d0c413eae517f68f03288fad01541634..3e2bea01479e109c1bdc9a3d98f403984e72198e 100755
--- a/testsuite/expect/test28.8
+++ b/testsuite/expect/test28.8
@@ -172,6 +172,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.9 b/testsuite/expect/test28.9
index de3667a19b4fd87807154696d42fb323f9ef44fe..ca753de3e4aa0b39ee0e4c43228ff792a0b4dd83 100755
--- a/testsuite/expect/test28.9
+++ b/testsuite/expect/test28.9
@@ -111,6 +111,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.1 b/testsuite/expect/test29.1
index f376456b67c96b467ccba9a3ddd69a32f35e38e6..559a1cdd42006af8418ffa59f8d1de76aab2374d 100755
--- a/testsuite/expect/test29.1
+++ b/testsuite/expect/test29.1
@@ -51,7 +51,4 @@ if {$match != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test29.2 b/testsuite/expect/test29.2
index fd5fe2effba82cfafb33bb2765bd92f5561262c3..0d77d6bd50280d7cb34669162efb7ddea34051d5 100755
--- a/testsuite/expect/test29.2
+++ b/testsuite/expect/test29.2
@@ -69,7 +69,4 @@ if {$match != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test29.3 b/testsuite/expect/test29.3
index a7c9c11fce2321b7afac0c1f7ad399b50b0bcc58..f6546c834390881ece27dffa8ea769293ef2c8b1 100755
--- a/testsuite/expect/test29.3
+++ b/testsuite/expect/test29.3
@@ -196,6 +196,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.4 b/testsuite/expect/test29.4
index 7b09edf9d8bfd2181991cbe2cdb99f7bfa85ae38..5d75bd17fd82055401afcef41008091fd05f3961 100755
--- a/testsuite/expect/test29.4
+++ b/testsuite/expect/test29.4
@@ -178,6 +178,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.5 b/testsuite/expect/test29.5
index 5eea37fea8197b8dace5e2f15bd509ad0131de3b..a0e73d8fd65b3ec57161c6527430df41dcb149ea 100755
--- a/testsuite/expect/test29.5
+++ b/testsuite/expect/test29.5
@@ -197,6 +197,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.6 b/testsuite/expect/test29.6
index c72238289ba22d454d296a536dce218319d8f2ef..ecc7e6e7b3e69034fa8d8c4cb4ce382a49feff70 100755
--- a/testsuite/expect/test29.6
+++ b/testsuite/expect/test29.6
@@ -241,6 +241,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.7 b/testsuite/expect/test29.7
index 451a64903fd5b9fd36ac572770b6851e9d760710..35728ea4dc60f33270406bd11ed2dde93bf71d42 100755
--- a/testsuite/expect/test29.7
+++ b/testsuite/expect/test29.7
@@ -193,6 +193,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.8 b/testsuite/expect/test29.8
index 8f12cf645123eab520e4d7bbca82e7174552080f..75fc4d910a6bb88149abcec6d006adecbd07954c 100755
--- a/testsuite/expect/test29.8
+++ b/testsuite/expect/test29.8
@@ -214,7 +214,6 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.1 b/testsuite/expect/test3.1
index c765bc807e0a7c30c17e452be34e558b3e75dbb6..5a1db7c0c1e3162d44bb49cf68e5126b8a2ed9d7 100755
--- a/testsuite/expect/test3.1
+++ b/testsuite/expect/test3.1
@@ -92,6 +92,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.10 b/testsuite/expect/test3.10
index ee176ae96854915af32f1eb2db2ba50b52070cd5..53f5332546f071c79557526880cc8cbce5b12f4d 100755
--- a/testsuite/expect/test3.10
+++ b/testsuite/expect/test3.10
@@ -187,7 +187,4 @@ if {$matches == 0} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index b067e9ae0e6986230de59405f03818a9117e807d..c82bde6809bfc25d3eb0afbf94a9c16cadcb2e8b 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -473,7 +473,6 @@ inc3_11_10
inc3_11_11
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test3.12 b/testsuite/expect/test3.12
index 03becc81bab4478de12bbe656d56c7c640d22e8e..11e62314b4fb1c481a88f98c1bdf6da01c1297af 100755
--- a/testsuite/expect/test3.12
+++ b/testsuite/expect/test3.12
@@ -189,7 +189,4 @@ if {$read_state != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.13 b/testsuite/expect/test3.13
index c13a6d6ffc33390bf2d0f5fb013434a4ae31ddc6..f0512a5d9ebd265c7730b6c6886fd0ebc18a25f9 100755
--- a/testsuite/expect/test3.13
+++ b/testsuite/expect/test3.13
@@ -188,7 +188,4 @@ if {$read_priority == 0} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.14 b/testsuite/expect/test3.14
index 8980f9dd75979ffdf9d78478134bf3bccfdf06da..ec31a8bcf02bcae125b1cd68a7747966c09e74d4 100755
--- a/testsuite/expect/test3.14
+++ b/testsuite/expect/test3.14
@@ -210,9 +210,7 @@ expect {
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.15 b/testsuite/expect/test3.15
index c85905dceab0308d959c29dd33733c07c6312723..6ad9541e8a08590cf43c8ae58e6cb099177b8e4a 100755
--- a/testsuite/expect/test3.15
+++ b/testsuite/expect/test3.15
@@ -332,10 +332,4 @@ cancel_job $job_id1
cancel_job $job_id2
restore_conf $config_file
reconfigure
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- send_user "\nFAILURE\n"
-}
-exit $exit_code
+fail_on_error "Error restoring reconfiguration"
diff --git a/testsuite/expect/test3.16 b/testsuite/expect/test3.16
index 723173038933ea8904e948887f7d4cb6ce45796d..7c413860ee22077d695061c2f30134dae4e112d4 100755
--- a/testsuite/expect/test3.16
+++ b/testsuite/expect/test3.16
@@ -143,7 +143,4 @@ delete_lic $lic_a
delete_lic $lic_b
delete_lic $lic_c
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.17 b/testsuite/expect/test3.17
index 2a06ac408e7d0166195dfb7b5ade95e4bcce8a15..ecdfb1264396ea4e628ea7b0b395fd13f93af5cd 100755
--- a/testsuite/expect/test3.17
+++ b/testsuite/expect/test3.17
@@ -208,6 +208,5 @@ set_node_feature $node_name $orig_avail_node_feat $orig_active_node_feat
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.18 b/testsuite/expect/test3.18
index 8b35c74bd3efa392e200871ba3d94875c31dd74c..f16af3c77d9dbc258047bc78b5b61941824a17c0 100755
--- a/testsuite/expect/test3.18
+++ b/testsuite/expect/test3.18
@@ -125,7 +125,4 @@ if {$matches != 1} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2
index 2e83c284398b55858a7397eb591d0d44f4767d5b..518a6939e89e999e5e3ff9a39d5cf550b04ded9d 100755
--- a/testsuite/expect/test3.2
+++ b/testsuite/expect/test3.2
@@ -251,7 +251,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.3 b/testsuite/expect/test3.3
index 48b4486d9dd860297b6f09314f685726e3812350..8a153bf82f1a5aec195d9a9dc4a290f65e29edcf 100755
--- a/testsuite/expect/test3.3
+++ b/testsuite/expect/test3.3
@@ -219,7 +219,4 @@ if {$read_state != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index 9c74cc43c0ad345ae8afa5b1edcd3db7d53084ab..0eac69237d7232a4ecf0da9d54d16758847199c9 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -165,7 +165,4 @@ if {$validate_new_priority && ($read_priority != $new_prio)} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index 409b9d1af7238f9b78b3937d57df739bd11e616d..84c2f21d412c0cea1c5b9519b4aa5df4d13a51be 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -444,7 +444,4 @@ if {$found != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index 684615a389595f978aee92383d9c784b68ad9522..b2f2a6eceb7c3c643e335c4d740d69542ab5f65a 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -97,9 +97,6 @@ expect {
}
}
if {$found == 1} {
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index b169d19f1d1309c4150698b588d0e92553cc41cd..3bf07a4bf1c2b6a34d335929cae82addeb799af9 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -259,7 +259,6 @@ if {$not_supported == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out1 $file_out2 $file_prog $file_prog_sh1 $file_prog_sh2
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: May be due to use of gang scheduler, a race conditions, or the ProcTrack plugin not identifying the application as part of the job.\n"
}
diff --git a/testsuite/expect/test3.8 b/testsuite/expect/test3.8
index 1a366615a93841bc7463fe915002f96379a17703..9d2a31f7427227082d1ef45663036791c1d91c68 100755
--- a/testsuite/expect/test3.8
+++ b/testsuite/expect/test3.8
@@ -260,6 +260,5 @@ if {[file exists $file_flag_2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
exec $bin_rm -f $file_flag_1 $file_flag_2 $file_flag_3 $file_flag_4
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.9 b/testsuite/expect/test3.9
index 5a34f5bb65d020cf6c89f76cbd05429ca30eb119..faa7c25dee885c93f17aa52924723113a6868a3e 100755
--- a/testsuite/expect/test3.9
+++ b/testsuite/expect/test3.9
@@ -67,7 +67,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test31.1 b/testsuite/expect/test31.1
index 4bc1d07689d3fb37794b84594347faa0effd6de0..e669ff511b307609181b8c4941f30c99b6d50c60 100755
--- a/testsuite/expect/test31.1
+++ b/testsuite/expect/test31.1
@@ -379,6 +379,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -fr $config_dir/$inc_slurm $config_dir/$pro_epi_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test31.2 b/testsuite/expect/test31.2
index ffc9e4f7b78516435cd2d1e043d929600abc7449..7670376e558f25c5452f5f3ba9db618e13d0dbd6 100755
--- a/testsuite/expect/test31.2
+++ b/testsuite/expect/test31.2
@@ -274,6 +274,5 @@ cancel_job $job_id
if {$exit_code == 0} {
clean_up
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.1 b/testsuite/expect/test32.1
index b0aeda584dedd93cfd9d78ef15ffd87b97ccaa36..3e69c38ebfd0fe121caa45b345e3faee0dbdf0cf 100755
--- a/testsuite/expect/test32.1
+++ b/testsuite/expect/test32.1
@@ -60,7 +60,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.10 b/testsuite/expect/test32.10
index 64827edd1f1e0c79c467225ce2d3e81f194ab716..01f4228be15f8fc56a416453f83e0e5610ad9f13 100755
--- a/testsuite/expect/test32.10
+++ b/testsuite/expect/test32.10
@@ -138,6 +138,5 @@ if {$file_cnt != [expr $node_cnt * 2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.11 b/testsuite/expect/test32.11
index c212cc3afe236cdbc2b10f348c1a251748fcf483..577906e4a9e17cf94c90659f1451ea660769237d 100755
--- a/testsuite/expect/test32.11
+++ b/testsuite/expect/test32.11
@@ -155,6 +155,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.12 b/testsuite/expect/test32.12
index 580b746f19281bdfbcc36f1d510fdfba5c2e1d86..3cf2877fbe1455742f5478bfbfd2632eb59eb791 100755
--- a/testsuite/expect/test32.12
+++ b/testsuite/expect/test32.12
@@ -146,6 +146,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.2 b/testsuite/expect/test32.2
index 73a2a172a8b8b1e39abde03e1a45512ae8db4b50..c8758487a924a3dadb7cca4ae73f15560d5d4b9b 100755
--- a/testsuite/expect/test32.2
+++ b/testsuite/expect/test32.2
@@ -64,7 +64,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.3 b/testsuite/expect/test32.3
index 80eb3571242fedb0bcdb5dcdca2f8894e6f2b5a0..d8648c9d176832319a41ddacdb55c8bbc8f3f386 100755
--- a/testsuite/expect/test32.3
+++ b/testsuite/expect/test32.3
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.4 b/testsuite/expect/test32.4
index 74835521bb0b1299a2252f87ee9d52db325fc6f7..d189295ce3028d900a3f339b7cd4bc4f9b92ea86 100755
--- a/testsuite/expect/test32.4
+++ b/testsuite/expect/test32.4
@@ -145,6 +145,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.5 b/testsuite/expect/test32.5
index 97f5c896bc75f31891f8a23c2d9ea9e918204cff..51686cb49082d771652556daa36ecef404e19240 100755
--- a/testsuite/expect/test32.5
+++ b/testsuite/expect/test32.5
@@ -141,6 +141,5 @@ if {$file_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.6 b/testsuite/expect/test32.6
index 04ff944606b0c446101ad1bfdef80ac77bf7f098..581b100d7fed20d6a32d21cbe74d04c43c68fb90 100755
--- a/testsuite/expect/test32.6
+++ b/testsuite/expect/test32.6
@@ -146,6 +146,5 @@ if {$rm_cnt == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.7 b/testsuite/expect/test32.7
index 43ed7ee2c97291982c4db1649fa314683219ca18..2cbf7c4c96ee8e4e27441cad6163cf4252446540 100755
--- a/testsuite/expect/test32.7
+++ b/testsuite/expect/test32.7
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.8 b/testsuite/expect/test32.8
index 655c0a8d7aa814b27003eca27839338ac01224a8..86066a53f057d200de35f69f1c2ca7ae1abeff94 100755
--- a/testsuite/expect/test32.8
+++ b/testsuite/expect/test32.8
@@ -146,6 +146,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.9 b/testsuite/expect/test32.9
index 672e6f6556d4dfeda406447d05d2e08c5bd0c784..6c423fdbf0936ce3932631633413022f391ccc9a 100755
--- a/testsuite/expect/test32.9
+++ b/testsuite/expect/test32.9
@@ -136,6 +136,5 @@ if {$matches != [expr $node_cnt * 2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test33.1 b/testsuite/expect/test33.1
index 70dc5a0287f8461146ba37ce543f025ce821ba3c..bfb34486e527712e5c1bdc97083bf575222df114 100755
--- a/testsuite/expect/test33.1
+++ b/testsuite/expect/test33.1
@@ -196,7 +196,6 @@ if {$cfgok != $cfgcount} {
send_user "\n\nFAILURE\n"
set exit_code 1
} else {
- send_user "\nSUCCESS\n"
file delete $test_prog
}
exit $exit_code
diff --git a/testsuite/expect/test34.1 b/testsuite/expect/test34.1
index 0f5e5ee0134883599f063e12ed796fcb3707f69e..8356f44ff8cdf31ef4bd47b6378d3ebb385f5ce2 100755
--- a/testsuite/expect/test34.1
+++ b/testsuite/expect/test34.1
@@ -369,6 +369,5 @@ clean_up 0
if {$exit_code == 0} {
exec $bin_rm $job1 $job2 $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test34.2 b/testsuite/expect/test34.2
index 75edcc15203cd0d66c920295742695e8393a0692..00d8e17914b6f7951471faeb32bebb6be11ae648 100755
--- a/testsuite/expect/test34.2
+++ b/testsuite/expect/test34.2
@@ -296,6 +296,5 @@ clean_up 0
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.1 b/testsuite/expect/test35.1
index cee710e4c76c0a5bbc3fcd5c57512ca1361767a0..40dc9928819b5792a17fd2c43b849489b4a2892c 100755
--- a/testsuite/expect/test35.1
+++ b/testsuite/expect/test35.1
@@ -208,6 +208,5 @@ if {$job_id_rm == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $output_mk $output_rm $output_use
exec $bin_rm -f $script_mk $script_rm $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.2 b/testsuite/expect/test35.2
index 22dba48e856434ed3e590a178aa6a982b5dda1d9..cd7d5e6ad9b5224972da0502f06bf87595866d0f 100755
--- a/testsuite/expect/test35.2
+++ b/testsuite/expect/test35.2
@@ -177,6 +177,5 @@ if {[find_bb_data $output_data $data_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $input_data $output_data
exec $bin_rm -f $output_use $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.3 b/testsuite/expect/test35.3
index f3a6f6037016abbe2a074c335f9c72baf7648969..96c631f288c7f60ec2b61765c8c78392c6f67c79 100755
--- a/testsuite/expect/test35.3
+++ b/testsuite/expect/test35.3
@@ -183,6 +183,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $input_data $output_data $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.4 b/testsuite/expect/test35.4
index f6fde930b1462796ce343c23fa505fc5247e7404..1ff24001423f9eb2f12940c77d289f288ad77310 100755
--- a/testsuite/expect/test35.4
+++ b/testsuite/expect/test35.4
@@ -195,6 +195,5 @@ if {$job_id_rm == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $output_use $script_mk $script_rm $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.5 b/testsuite/expect/test35.5
index 9a64edd11505b0f28f8173aa333196037693275f..d3882a9ea737af623a94bcef92ce13acec2ad85c 100755
--- a/testsuite/expect/test35.5
+++ b/testsuite/expect/test35.5
@@ -147,7 +147,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test35.6 b/testsuite/expect/test35.6
index 45b5a293fe86b2012dcf7ab019a069d2ff917766..d1d7d7edd2721997fa122e2fd48de5cf51376ee1 100755
--- a/testsuite/expect/test35.6
+++ b/testsuite/expect/test35.6
@@ -111,6 +111,5 @@ if {$found == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $script_child $script_parent
exec $bin_rm -f $output_child $output_parent
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test36.1 b/testsuite/expect/test36.1
index dc5d05b47a42165a96d54c4436b8fd5b26a7340f..59dbee63ba82586a3f002456c7cbf5814f8644ed 100755
--- a/testsuite/expect/test36.1
+++ b/testsuite/expect/test36.1
@@ -76,9 +76,7 @@ if {[string compare $control_machine $lsid_control_machine]} {
set exit_code 1
}
-if {!$exit_code} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test36.2 b/testsuite/expect/test36.2
index 222fc27ea07b6fafb58e62d2c4be5d1aeb8e65b3..e905e15bf23df57a621cf53e4804b863cde4dd99 100755
--- a/testsuite/expect/test36.2
+++ b/testsuite/expect/test36.2
@@ -123,7 +123,6 @@ cancel_job $job_id
if {$exit_code == 0} {
if {$job_found == 1} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: bjobs $job_id does not work\n"
exit 1
diff --git a/testsuite/expect/test36.3 b/testsuite/expect/test36.3
index 0f09afd6d0e91f6da2d0777d3b979db9ca5089f9..9baaa11cf0eb577b1e74fcee59734a5dcf9cc62a 100755
--- a/testsuite/expect/test36.3
+++ b/testsuite/expect/test36.3
@@ -153,7 +153,6 @@ if {$state_match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test36.4 b/testsuite/expect/test36.4
index 7a35b31c9c3dc00c373503988b7a401328b8c697..e597cd702dca273de3ff4330fe5abb96c73e91cc 100755
--- a/testsuite/expect/test36.4
+++ b/testsuite/expect/test36.4
@@ -116,6 +116,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.10 b/testsuite/expect/test38.10
index 3be4bd53ad22f1d6ddc83a8f8692f63fcdbdaef8..56326927a7336ded7ea9bd957cf5c7426df4c7d2 100755
--- a/testsuite/expect/test38.10
+++ b/testsuite/expect/test38.10
@@ -133,5 +133,4 @@ check $pack_job_id+2 7 1
check $pack_job_id+1 6 1
check $pack_job_id+0 5 1
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.11 b/testsuite/expect/test38.11
index 46fcab0ddb75b9e4a0f115a0e9334a14c65407d9..459c64638556a904f547bd198fe8392ef1b9e559 100755
--- a/testsuite/expect/test38.11
+++ b/testsuite/expect/test38.11
@@ -221,6 +221,5 @@ if {$matches != 4} {
if {$exit_code == 0} {
exec $bin_rm -rf $script1
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.12 b/testsuite/expect/test38.12
index 484a8e61b74c571445ef56c8ebda278137bb3c73..ba80ccceef11f874411151755812b9ba172337f4 100755
--- a/testsuite/expect/test38.12
+++ b/testsuite/expect/test38.12
@@ -277,5 +277,4 @@ expect {
}
}
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.14 b/testsuite/expect/test38.14
index f075c88f5e142f683d3c145b0df9f6ac1ff5fb4b..9130151b9c970e57636a9f242994a83136c91e21 100755
--- a/testsuite/expect/test38.14
+++ b/testsuite/expect/test38.14
@@ -88,6 +88,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.15 b/testsuite/expect/test38.15
index cf4a2cf1bfa81240f3f9362cf35b2597492248b8..664cc45d5c90554b073a3a9f0d3a8c0baf274efd 100755
--- a/testsuite/expect/test38.15
+++ b/testsuite/expect/test38.15
@@ -167,5 +167,4 @@ expect {
}
exec $bin_rm -f $file_in
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.16 b/testsuite/expect/test38.16
index 8ec992b51e4c2a07eb0d2d55059a3a4afce0c7d5..cd77760b496802955a306062fb4becb0a066112c 100755
--- a/testsuite/expect/test38.16
+++ b/testsuite/expect/test38.16
@@ -241,5 +241,4 @@ if {$matches != 2} {
}
exec $bin_rm -f $file_in $file_out
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.7 b/testsuite/expect/test38.7
index 21d182ccddff6c034de3205f34c384b4940c15ac..2228a8728cac1c899999f51cf3fe4afdbc365c4b 100755
--- a/testsuite/expect/test38.7
+++ b/testsuite/expect/test38.7
@@ -580,7 +580,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test38.8 b/testsuite/expect/test38.8
index d0693c9ddbddf240b6faa9c84ab7e1cf52cd7ce9..f7617f681fd831ebfd4cee7675d4e685c7ac655a 100755
--- a/testsuite/expect/test38.8
+++ b/testsuite/expect/test38.8
@@ -180,5 +180,4 @@ for {set inx 0} {$inx < 3} {incr inx} {
}
}
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.9 b/testsuite/expect/test38.9
index 5b09350ac6cac8cf93756139f770ee0f0c11dde4..d06042ce525ba32525cb8019e8bbbb04a8d46344 100755
--- a/testsuite/expect/test38.9
+++ b/testsuite/expect/test38.9
@@ -306,5 +306,4 @@ if { $matches != 1} {
send "exit\r"
-send_user "\nSUCCESS\n"
exit 0
diff --git a/testsuite/expect/test39.1 b/testsuite/expect/test39.1
index 95b41ae60200377cd2a28263ed4838275c4558f5..36cf8e5f1178e80268a88e72d9031fbd3e5673bf 100755
--- a/testsuite/expect/test39.1
+++ b/testsuite/expect/test39.1
@@ -209,6 +209,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.10 b/testsuite/expect/test39.10
index a7f03b706c2dc5a2d5879b74294b3ef228ad01b0..2a453ab6f2b81a628608b228a6eaccf44b04c070 100755
--- a/testsuite/expect/test39.10
+++ b/testsuite/expect/test39.10
@@ -276,6 +276,5 @@ if {$gpu_cnt > 1 && $nb_nodes > 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.11 b/testsuite/expect/test39.11
index beb7944bd83610b6a09493b81a2b243eb0f2d6e1..349263e4fad3543f468cc149e569651ec4e532e2 100755
--- a/testsuite/expect/test39.11
+++ b/testsuite/expect/test39.11
@@ -144,6 +144,5 @@ if {0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.12 b/testsuite/expect/test39.12
index 97c60c61353881752f5628e97c53b7d08eee4bfa..6b5226ac27e2e7f00451ec6f8cdccf75e3dbbbb0 100755
--- a/testsuite/expect/test39.12
+++ b/testsuite/expect/test39.12
@@ -344,6 +344,5 @@ if {$match_gpu != $expected_gpus} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.13 b/testsuite/expect/test39.13
index a07881030482299665301fa92b18ae6aef80e7b6..08c6fc4daacd558ca66410c2ceddaa5eae303f1d 100755
--- a/testsuite/expect/test39.13
+++ b/testsuite/expect/test39.13
@@ -183,6 +183,5 @@ exec $scancel -n "test$test_id"
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.14 b/testsuite/expect/test39.14
index 6ca9515d5f31308639486c4d88cfd63300cc2ebc..47953daa2de91c5699ea452debf5981be9238c87 100755
--- a/testsuite/expect/test39.14
+++ b/testsuite/expect/test39.14
@@ -221,6 +221,5 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3 $file_out1 $file_out2
exec $bin_rm -f slurm_job_${job_id2}_resize.csh
exec $bin_rm -f slurm_job_${job_id2}_resize.sh
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.15 b/testsuite/expect/test39.15
index 4589ed2e0dff7933047b293fafa3008e1ead3e18..9b481c84245fd2235e49cf8babd900a3e774181f 100755
--- a/testsuite/expect/test39.15
+++ b/testsuite/expect/test39.15
@@ -115,6 +115,5 @@ if {$match != $nb_tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.16 b/testsuite/expect/test39.16
index e938087062c17781d87ec6f26269f196edd659ef..3818c6298485faed8759ab4775c8338d7d721cfc 100755
--- a/testsuite/expect/test39.16
+++ b/testsuite/expect/test39.16
@@ -110,6 +110,5 @@ if {$match != $nb_tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.17 b/testsuite/expect/test39.17
index 571d9c2eccb4ea9055d2f4dbfa24cd4be84b3fc8..7fae99cfb113f85ea1be3f8fc3a9d663d9b0b26c 100755
--- a/testsuite/expect/test39.17
+++ b/testsuite/expect/test39.17
@@ -1134,6 +1134,5 @@ if {$gpu_cnt > 3 && $nb_nodes >= 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.18 b/testsuite/expect/test39.18
index d4101ea79c9675f631bb55a2c744c9582f9cc977..7a66bcdae168977d0d0105d3e68f9fef35390c6e 100755
--- a/testsuite/expect/test39.18
+++ b/testsuite/expect/test39.18
@@ -1856,9 +1856,7 @@ check_configuration 2.56 $slurm_conf_gres $gres_conf $fake_gpus_conf $expected_o
# # Cleanup and finish
# ##############################################################################
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "FAILURE: Tests $test_id.\["
set length [llength $failed_tests]
set i 0
diff --git a/testsuite/expect/test39.19 b/testsuite/expect/test39.19
index 395a5d3613331c8ba9f0534dd0c1c96b7d0548db..27d27769b7f5dd2ee5c209ee4a2aeb43b095cd8b 100755
--- a/testsuite/expect/test39.19
+++ b/testsuite/expect/test39.19
@@ -678,6 +678,5 @@ test_acct $job_id $job_tasks $step_tasks $have_gpu_types
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.2 b/testsuite/expect/test39.2
index 7be400b776d88ac273696349eb04245543fa6b11..b5936174af7f453e877540f06fe1815203606f94 100755
--- a/testsuite/expect/test39.2
+++ b/testsuite/expect/test39.2
@@ -167,6 +167,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.20 b/testsuite/expect/test39.20
index 03e7b247f64b98684a3e2ae78a5053c7783833bd..ef428a1756765a971445fc14752149462238cb16 100755
--- a/testsuite/expect/test39.20
+++ b/testsuite/expect/test39.20
@@ -432,6 +432,5 @@ cleanup
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.21 b/testsuite/expect/test39.21
index a23f77b4fdae9e26c740407572a9e5980e216707..e21bc3dfc593712bccb3329eea7726df82a2dd07 100755
--- a/testsuite/expect/test39.21
+++ b/testsuite/expect/test39.21
@@ -122,6 +122,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.22 b/testsuite/expect/test39.22
index be6b89cdfd97aa1cf1548301e26e5e8dadb9776a..6ab304d3d926341c82067b8e847afd8ed0456c59 100755
--- a/testsuite/expect/test39.22
+++ b/testsuite/expect/test39.22
@@ -105,6 +105,5 @@ if {$match != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.23 b/testsuite/expect/test39.23
index e28efa6cfe8527e4496084ed1812a23ed6ffbde9..349a3b7d0f42f6d29261b0315f40e139aa7327ef 100755
--- a/testsuite/expect/test39.23
+++ b/testsuite/expect/test39.23
@@ -298,6 +298,5 @@ if {$gpu_cnt > 1 && $num_cpus > 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.3 b/testsuite/expect/test39.3
index 051768cd79ac136e683e1a2f699387cd06728d45..1dc59eff92287fb2ee26a2ef5087b0b3b0e82124 100755
--- a/testsuite/expect/test39.3
+++ b/testsuite/expect/test39.3
@@ -172,6 +172,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.4 b/testsuite/expect/test39.4
index 4884ae68118f8f995e947248b863ad9386388c24..79215920f0e8df9448c973203ccd3b65fb36bbff 100755
--- a/testsuite/expect/test39.4
+++ b/testsuite/expect/test39.4
@@ -200,7 +200,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test39.5 b/testsuite/expect/test39.5
index 308392381ddebc5f2af01ee2cdabd6361ab77335..f36729e487fad2c8d585bb3e606a01005567b128 100755
--- a/testsuite/expect/test39.5
+++ b/testsuite/expect/test39.5
@@ -340,6 +340,5 @@ if {$match != $expected_gpus} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.6 b/testsuite/expect/test39.6
index 7dfde0cd91bf2deb796975e8ae450f379d74d2be..a3af2b83615eb468e81325551f07aed621d1f000 100755
--- a/testsuite/expect/test39.6
+++ b/testsuite/expect/test39.6
@@ -194,6 +194,5 @@ if {$match != $gpu_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.7 b/testsuite/expect/test39.7
index 21ccda76708351412f26e7ea2013793595d02bb4..a2b3bf637c2bdce15705f02c9deda807a5a9ae4b 100755
--- a/testsuite/expect/test39.7
+++ b/testsuite/expect/test39.7
@@ -227,6 +227,5 @@ if {$gpu_cnt > 1 && $nb_nodes > 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.8 b/testsuite/expect/test39.8
index 633f0ccedd05a6ba3456ba9e6ee8158a8cafd956..1b138af10815f96fe9b44afd58e11058d942b5e9 100755
--- a/testsuite/expect/test39.8
+++ b/testsuite/expect/test39.8
@@ -210,6 +210,5 @@ if {$matches != $match_goal} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.9 b/testsuite/expect/test39.9
index 91b40f67b5fae7339d3fdf707d9c68db437b954c..3243ec79dc9a6cec149a9facc4aa0adaedda34bf 100755
--- a/testsuite/expect/test39.9
+++ b/testsuite/expect/test39.9
@@ -269,7 +269,6 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
print_time
diff --git a/testsuite/expect/test4.1 b/testsuite/expect/test4.1
index 77f6e4f8d590831172271444800cf337d5bcad2f..950af323f01f8b2d1cecac925961cbbf0d81f143 100755
--- a/testsuite/expect/test4.1
+++ b/testsuite/expect/test4.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sinfo failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.10 b/testsuite/expect/test4.10
index 16370c1602de38f9ccf2d0db4f14846b64dbcf9b..9c510f67d44996e5c351c9efa84e69dcd2a463ec 100755
--- a/testsuite/expect/test4.10
+++ b/testsuite/expect/test4.10
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sinfo version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index 9a05dcdbaefbd2d7486a8fdb996a703c33252c06..15521856bfb42ecc0447554f9c202d7725f85b40 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -65,7 +65,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index 580a5fde6106e1bdb823466427ad57e51ae37988..518157bac6436464d084f497de47d1be4ee21b15 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -419,8 +419,4 @@ if {!$exit_code && $smallest != $inode_procs} {
sleep 1
set exit_code [allocate_and_quit $inode_name $inode_procs $inode_procs]
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- exit $exit_code
-}
+exit $exit_code
diff --git a/testsuite/expect/test4.13 b/testsuite/expect/test4.13
index 248361121ad4864bb6382de7675f978891f64705..3c530bbe574c7177dce573a63ebc766268cd505d 100755
--- a/testsuite/expect/test4.13
+++ b/testsuite/expect/test4.13
@@ -244,9 +244,7 @@ foreach option [array names part_sinfo_vals] {
cleanup
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test4.14 b/testsuite/expect/test4.14
index 86e02d0ad8f1861ec97e2568aed51717d400ff8e..ab703303c5460d93e397bd5efcf946d3bf6e5366 100755
--- a/testsuite/expect/test4.14
+++ b/testsuite/expect/test4.14
@@ -299,8 +299,4 @@ if {$match != 1} {
# Delete test partitions
delete_part
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
-
exit $exit_code
diff --git a/testsuite/expect/test4.2 b/testsuite/expect/test4.2
index 5fd744acee5152ed517f8159c77529fbf52c4793..a97829a9cb089ca0c4c74a7b2d096fb1d15597ce 100755
--- a/testsuite/expect/test4.2
+++ b/testsuite/expect/test4.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sinfo failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index 798fa1b304c134558028ec5f8fb56e10c28d4343..78496c8b23142812db85be1b69cdb4bf816a66ba 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -261,7 +261,4 @@ if {$matches != 10} {
send_user "\nFAILURE: sinfo partition long format error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index 22ed1ab02fb76671114ec32752e54da7815bb1fc..207a189e543584f00fa01cb0c6e236476b1e2d6a 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -144,7 +144,4 @@ if {$matches != 6} {
send_user "\nFAILURE: sinfo node long format error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 45a36885fc0eef6b509444349bf3c9abed1a385b..9ca42199b4b56a6e087c86177ed8fbe3049c056d 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -305,6 +305,5 @@ if {$mismatches != 0} {
}
if {$exit_code == 0} {
file delete $tmp_sc
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test4.6 b/testsuite/expect/test4.6
index ca679c3ba4d9437e4ecd09f60d9afbd36cbb09cd..8c57f6c258eb18349fff77c2cf61e637dd3c4b14 100755
--- a/testsuite/expect/test4.6
+++ b/testsuite/expect/test4.6
@@ -65,7 +65,4 @@ if {$iteration < 3} {
send_user "\nFAILURE: sinfo iteration error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.7 b/testsuite/expect/test4.7
index 641ab397dee9d133567a9957991c3e69a0e717eb..9bd809467da53ac0f7ebf56199d298ae8a1c637f 100755
--- a/testsuite/expect/test4.7
+++ b/testsuite/expect/test4.7
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sinfo failed to process verbose option\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.8 b/testsuite/expect/test4.8
index 8d1dfba5c55e98dee993bf4df92854bc1812e66e..0fa838185add80d66587cc9c4c5b90713d1cfbd1 100755
--- a/testsuite/expect/test4.8
+++ b/testsuite/expect/test4.8
@@ -122,7 +122,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.9 b/testsuite/expect/test4.9
index 6c401a4141fe176c33c205cf84e5c04ff58be5f1..a8de47218a98d5e6d2dc6758e947db6626e8a3bb 100755
--- a/testsuite/expect/test4.9
+++ b/testsuite/expect/test4.9
@@ -93,8 +93,5 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test40.1 b/testsuite/expect/test40.1
index 1b3107530393c030fc3f18428b22cffc39d470be..765292117d8ea183737170d09c7a95fe866ca4f4 100755
--- a/testsuite/expect/test40.1
+++ b/testsuite/expect/test40.1
@@ -114,7 +114,4 @@ expect {
# The tests already exist in src/common/gres.c to reject such jobs
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test40.2 b/testsuite/expect/test40.2
index d4ddb4999ac7a98afea17fca6993a4de4bbc06d4..05965c6195a4e4d5d9dcf4bc3d25958f02b88491 100755
--- a/testsuite/expect/test40.2
+++ b/testsuite/expect/test40.2
@@ -585,6 +585,5 @@ if {[test_front_end] == 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.3 b/testsuite/expect/test40.3
index cdb5c9defd1746e9446a86d2a7f7492e04dd53f5..f94756f4a2fc91d34deb6c4d15bd9f3fe2795884 100755
--- a/testsuite/expect/test40.3
+++ b/testsuite/expect/test40.3
@@ -351,6 +351,5 @@ test_acct $job_id $target $target $have_mps_types
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.4 b/testsuite/expect/test40.4
index 17273f52b7c31759f854f98e61562b50677e588a..b9a528b00852a9d243d56556e9a9b4e0833c247c 100755
--- a/testsuite/expect/test40.4
+++ b/testsuite/expect/test40.4
@@ -241,6 +241,5 @@ cleanup
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.5 b/testsuite/expect/test40.5
index bdc943ab2986f12697f265606444c4550d44fdf4..5bbc88f24dd2d73f78f80113b7e6fe257080fa63 100755
--- a/testsuite/expect/test40.5
+++ b/testsuite/expect/test40.5
@@ -264,6 +264,5 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3 $file_out1 $file_out2
exec $bin_rm -f slurm_job_${job_id2}_resize.csh
exec $bin_rm -f slurm_job_${job_id2}_resize.sh
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.6 b/testsuite/expect/test40.6
index 7ba25f8739558b7275328db652bf0d103c06592e..3235feb280ce6add4af79efd6e78be518b4169f1 100755
--- a/testsuite/expect/test40.6
+++ b/testsuite/expect/test40.6
@@ -183,6 +183,5 @@ if {$exit_code == 0 && $constrain_devices == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.8 b/testsuite/expect/test40.8
index 5c6b203d5836851b7f8d915a0c73d52a104c4d19..ad2436bc33d4dbf4d7aa02da8d31c7e5cef3b92a 100755
--- a/testsuite/expect/test40.8
+++ b/testsuite/expect/test40.8
@@ -192,6 +192,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test5.1 b/testsuite/expect/test5.1
index 9347de1d6ffffd90421c1c3f386f1cbfa2a7f567..ff6f4c63fa0e3c0f5eaf070d98e19f16157bb045 100755
--- a/testsuite/expect/test5.1
+++ b/testsuite/expect/test5.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: squeue failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.10 b/testsuite/expect/test5.10
index a4ed8d532478d90b194430badbaa167929a864bd..ca9e5203b27959effdee6f21257cf05e6c252e11 100755
--- a/testsuite/expect/test5.10
+++ b/testsuite/expect/test5.10
@@ -331,7 +331,6 @@ delete_part $test_part_2
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test5.11 b/testsuite/expect/test5.11
index 328dfefdb91a33f70aec9a0ab0a5833d4b68c468..f96cc12f831aaea36fba716db0ce2043a64e4558 100755
--- a/testsuite/expect/test5.11
+++ b/testsuite/expect/test5.11
@@ -278,9 +278,7 @@ if {$cpu_l_cnt == $cpu_h_cnt} {
each with different cpu counts -- finishing test now."
exec $bin_rm -fr $script
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
@@ -384,9 +382,7 @@ expect {
}
exec $bin_rm -fr $script
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test5.2 b/testsuite/expect/test5.2
index 9eb73f6e32f54879bc808818694e66d979736d28..c125af0ee36c02d8138e8fc40b0a1eebeeb85c4f 100755
--- a/testsuite/expect/test5.2
+++ b/testsuite/expect/test5.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: squeue failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.3 b/testsuite/expect/test5.3
index 68f01610ca2b22d04cbbf515f5a3212e513db95a..4e3ad8668de74da0c7919df81e48720ce3303bef 100755
--- a/testsuite/expect/test5.3
+++ b/testsuite/expect/test5.3
@@ -73,7 +73,4 @@ if {$iteration < 3} {
send_user "\nFAILURE: squeue iteration error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index c88719f30a195e064d0acc47bf3c2b7aba5f5895..a7958a2036e7163c539a3349d47841c142f43c53 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -241,8 +241,5 @@ if {[cancel_job $job_id1] != 0} {
if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index b4883302afc27625e6495c301db57a6e02436540..13f105ddb612e95492ff9cdf28e755fc3004e8f1 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -125,8 +125,5 @@ if {[cancel_job $job_id1] != 0} {
if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 92fc8d865b206fa44810af20b73317ea5a65face..55a0437ba69dc159b084398c29908b3b0432937e 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -408,7 +408,6 @@ if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test5.7 b/testsuite/expect/test5.7
index 899fbadf780c4254e7b7e0a3815f2a40389f69eb..1c3a2ed843c10ef1d1f7a2fd7021146bdf31cb77 100755
--- a/testsuite/expect/test5.7
+++ b/testsuite/expect/test5.7
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: squeue failed to process verbose option\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.8 b/testsuite/expect/test5.8
index d327eda47b4671baa0e17e144ea928a8aeac56c0..ac27c62f7fb6bb140a3c16716af3ef6f55b40e58 100755
--- a/testsuite/expect/test5.8
+++ b/testsuite/expect/test5.8
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper squeue version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 604c2df633ba68b13340b76db10d6062eb1f1cae..75d60ea257cccaef198f5785fcd5ba644055b3fa 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -464,7 +464,6 @@ remove_acct "" $test_acct
if {$exit_code == 0} {
exec $bin_rm -f $file_err $file_out $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test6.1 b/testsuite/expect/test6.1
index 698b102ee4da159cad90e02dd3ef7f8355beb420..86a732d1623e4cfd88f4eda9c242884503a4e45f 100755
--- a/testsuite/expect/test6.1
+++ b/testsuite/expect/test6.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: scancel failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index e9591026228bb0e2bcebc175f8a87b4ac1c47c22..ae0c184a15af9930f10eb17a10fbeccfa9e16f19 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -181,6 +181,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index a8292d6e1053555dc63bf22e0cab65019ecb8981..cf5e3b0b9b987acae092bcb13bcf8feb1e7a0951 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -125,6 +125,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index e6d67dc2678437eb1d0be39a5948fe6ef6116fbb..f5853faf1bbb23af26fcb2845fa29d6c673a9fda 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -310,7 +310,6 @@ if {[cancel_job $job_id] != 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index 0f104e597da56d06e49c9c009d8f5c369b16fcb8..f67e4770e104f2a400a5805adcd58de804750322 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -270,6 +270,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.14 b/testsuite/expect/test6.14
index 401be52e0e1b80188b4f8d81d9ef4c211f9cb9bd..deffdabd11347d15ee3e7fa8f84442bb63293746 100755
--- a/testsuite/expect/test6.14
+++ b/testsuite/expect/test6.14
@@ -186,11 +186,8 @@ foreach job_id $submitted_jobs {
}
}
-
-
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.16 b/testsuite/expect/test6.16
index f4eb2e60e932f5869d6b18f54df06ab5ea80b37e..256a4419cf1811b7586aafe119f557087fff227d 100755
--- a/testsuite/expect/test6.16
+++ b/testsuite/expect/test6.16
@@ -116,6 +116,5 @@ if {$matches != 3} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.17 b/testsuite/expect/test6.17
index 5f8c87adbff82b8a77fc843bc3db05d0994e6750..716e5a1fa149114659d0e6608a952ea2c8b4affc 100755
--- a/testsuite/expect/test6.17
+++ b/testsuite/expect/test6.17
@@ -107,9 +107,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.2 b/testsuite/expect/test6.2
index cb756ee597ea0e6f4fbfdc6f97ca223bd9aec8f4..47adf29ea6c76eaea2f95bcf6bdb63d91a545c8d 100755
--- a/testsuite/expect/test6.2
+++ b/testsuite/expect/test6.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: scancel failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index ae363f7624d284154fc52e407476cc7c26ec3b06..4bb22a09a21e1f1f514e12f96b61dc8209a917af 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -137,7 +137,6 @@ if {$matches != 3} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index f3536a8f91bf28a489c8755b98547b4f4a9ef03c..41b635e213890f0ce231c89ae9d1d6e85296dbb1 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -138,9 +138,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 5a1b57652928e8eed7ccaf8d8b525ede5a9f2588..50e0a2a5d88c099f6dddbfe983ac5c8a949c68ef 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -135,7 +135,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.6 b/testsuite/expect/test6.6
index 2ac0afdb3f39e5ce5d57175e25e2f5028695c0a1..cef7003b5873ab42c080a1706521db8715a6ad04 100755
--- a/testsuite/expect/test6.6
+++ b/testsuite/expect/test6.6
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper scancel version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index d102bbfe4565c320cac258d5852f40b8f83069bc..06462cf6b0e266d332bbf8e15a7fef7a25119cac 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -261,7 +261,6 @@ if {[wait_for_file $file_out2] == 0} {
if {$exit_code == 0} {
exec rm -f $file_in $file_out2 $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 344f7e3df62f4b772ded5b3f710505b2a06bb72e..0c8d952950e69fd1995ce2b2284135586e8a26d4 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -157,9 +157,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 1512cb3f306ab5873224a05e8e994c343e857ecd..66a81286371d872af74ecbc3165bc7a3ce9d00e3 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -130,6 +130,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index 6b62d5161bb0bd404f74db58c6304ebb8152deb1..bd87a140dd661b367c9756294c1c218abbf7264a 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -194,6 +194,5 @@ if {$prio3 != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.10 b/testsuite/expect/test7.10
index 94f24efd10bf34e98f1dd8e953a8a6d58854b54b..2839f6a4522ff243fd41d1ce25edc7e98a508e4e 100755
--- a/testsuite/expect/test7.10
+++ b/testsuite/expect/test7.10
@@ -88,6 +88,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f ${ld_preload}.c ${ld_preload}.lo ${ld_preload}.so
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.12 b/testsuite/expect/test7.12
index 12714e0841e509b9174a355aeb3fc4ead2c44c97..3c61c7089b06375560693a2479413c39c274fec7 100755
--- a/testsuite/expect/test7.12
+++ b/testsuite/expect/test7.12
@@ -147,6 +147,5 @@ if {$job_matches != 1} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_in $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.13 b/testsuite/expect/test7.13
index 774599b4ee55b2116eaa993684bfb99d3b7f15c9..b263c7230fd9ebb1fd5ecd8fc495507dbef431c9 100755
--- a/testsuite/expect/test7.13
+++ b/testsuite/expect/test7.13
@@ -274,7 +274,6 @@ if { [test_account_storage] == 1 } {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_prog1 $file_prog2
}
diff --git a/testsuite/expect/test7.14 b/testsuite/expect/test7.14
index 3196c68f35927029851908be1d75e1e32b6204d0..6679aae554b62ad8c5350b0f2cf3a9b764b76b68 100755
--- a/testsuite/expect/test7.14
+++ b/testsuite/expect/test7.14
@@ -175,7 +175,6 @@ if {$matches != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_prog1 $file_prog2
}
diff --git a/testsuite/expect/test7.15 b/testsuite/expect/test7.15
index f946333ad9c1740d47c13164d5ac3784782ee113..8dbda0559ef9c8d5823f2a691c4d6f8cbc66a8c7 100755
--- a/testsuite/expect/test7.15
+++ b/testsuite/expect/test7.15
@@ -98,7 +98,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_prog
}
diff --git a/testsuite/expect/test7.16 b/testsuite/expect/test7.16
index 9ef1ed92c8ffb75b9fbac64fe6bdd2052ea21a5a..7dcda933216a6d3aa1558aa7d812e670775b4485 100755
--- a/testsuite/expect/test7.16
+++ b/testsuite/expect/test7.16
@@ -106,8 +106,5 @@ if {$job_id != 0} {
}
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test7.17 b/testsuite/expect/test7.17
index f908f3db74108c8c006b7d2d2eb1417ae6a73287..fbb1ad5bd2682197355a179615fcca68606e7c2e 100755
--- a/testsuite/expect/test7.17
+++ b/testsuite/expect/test7.17
@@ -200,7 +200,6 @@ if {$fail_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
file delete $test_prog
}
exit $exit_code
diff --git a/testsuite/expect/test7.18 b/testsuite/expect/test7.18
index adc73ad18faa31b1d32c5088ccc56ca28af9eb46..58da94c764253884a6a10b67fb2aab62737b8dcb 100755
--- a/testsuite/expect/test7.18
+++ b/testsuite/expect/test7.18
@@ -62,7 +62,6 @@ expect {
if { $exit_code == 0 } {
file delete $test_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: One or more hosts weren't found.\n"
}
diff --git a/testsuite/expect/test7.19 b/testsuite/expect/test7.19
index 416023216fde6b01ea8d6ac27a7b7f505a7b3c3b..86cbb7516778244802061e39c726d26e28edf643 100755
--- a/testsuite/expect/test7.19
+++ b/testsuite/expect/test7.19
@@ -218,6 +218,4 @@ if { [test_srun 1] } {
#cleanup
exec $bin_rm $file_in
-send_user "\nSUCCESS\n"
-
exit 0
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index 47cb99ae91d879421ea10afd6a11282a7a134263..e830747124379b402705db87f9d78acf8bde5265 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -113,8 +113,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_prog_get
-
+ exec $bin_rm -f $file_prog_get
}
exit $exit_code
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index b29059ed60bf0d85f9df4b9b08212dbda0951123..362f2dd54b34d3adc96d615fb161d594f7403628 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -125,6 +125,5 @@ if {$matches != [expr $task_cnt * 3]} {
if {$exit_code == 0} {
file delete $io_prog $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index e79bdc65e9bc1ef6f3188af90baf3fddd68ff37b..d82b5bcbd106ade0a43bf43a41c3dffcd8747bca 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -260,6 +260,5 @@ if {$matches != 12} {
if {$exit_code == 0} {
exec $bin_rm -f $test_prog ${test_prog}.o ${test_prog}.TVD.v3breakpoints ${test_prog}.TVD.v3breakpoints~
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.5 b/testsuite/expect/test7.5
index 02fcd71b7c2fb715706c10e8cce2003923663aea..252bb6da4cb15ec0fb89a9c0b0348fc4c0fb5696 100755
--- a/testsuite/expect/test7.5
+++ b/testsuite/expect/test7.5
@@ -193,6 +193,5 @@ if {$fini_cnt > 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index d9404de4b1c124095db8cb1ecf98239814b811f3..99bcb3398a3ea3a673d0dfd15defb53b00d358c2 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -204,6 +204,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $test_prog ${test_prog}.o ${test_prog}.TVD.v3breakpoints
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.7 b/testsuite/expect/test7.7
index 485c5f031cbd861a0595ecdc0ae4d2158cc014bb..d1409decaaa7b3b77948e7d098769bfb5fac632a 100755
--- a/testsuite/expect/test7.7
+++ b/testsuite/expect/test7.7
@@ -205,6 +205,5 @@ for {set inx 1} {$inx < $max_tasks && $exit_code == 0} {incr inx} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index f0a25ba9050aa9cf58dac04c7c9f6a3f6c68fe0b..f6be4d4d299a5b5f947e07cbe6ad9771665d78e8 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -148,8 +148,6 @@ if {$matches != 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_in $file_prog $file_out
-
+ exec $bin_rm -f $file_in $file_prog $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 7a9417400126b66e1fc46fe4b140dfaf90fc6d20..60aed0ea32a280afbbc092c4dc206c1b9655f320 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count"
send_user " copy tests passed\n"
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index a484aeb32fbba0c9fe42d6880750cd71629d6fad..892b07b7b7cd5626964e16347fd8e0b060dce9f0 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -105,7 +105,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count"
send_user " hostname output tests passed\n"
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 50628ee78d1ab31fbe4cc3c41ca5706c09fc1fe4..05de03ffbf22bbee2f7a79b4ce86c8fe98e4c79a 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count I/O"
send_user " tests passed\n"
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index ee6e6f98fa1c2e661fc7076bd68f3484f405574b..fe2891ccf2f266fe1c1bbcb7602c09f3450bf487 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -153,9 +153,7 @@ for {set tsk 0} {$tsk < $task_cnt} {incr tsk} {
exec $bin_rm -f $file_in_glob $file_out_glob
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: Only $success_cnt of "
send_user "[expr $cycle_count * $task_cnt] task I/O tests passed\n"
}
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index 47081be8c927ddb05c12bdd98852d122c52725f2..b20237e00a04d9748998b2a7dd68a575da6a6437 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -136,9 +136,7 @@ for {set tsk 0} {$tsk < $task_cnt} {incr tsk} {
exec $bin_rm -f $file_in_glob
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: Only $success_cnt of "
send_user "$cycle_count task I/O tests passed\n"
}
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index 034157a139dfd2c15897177a2544049423f717ab..efce08fd2b64ee5864b2972c8e71423e76b0734f 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count hostname"
send_user " output tests passed\n"
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index a165f0a7084181b96206a06e82b3821f7d55bdac..6c6aca8c8ed55782e4cd5ea0481a5bf003ac6902 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -83,7 +83,4 @@ if {$success_cnt != $task_cnt} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index bd8fa1b79b05b41bdf465e08e0fe1dcfa56030ca..12c099da2936b39a117b7b7d555704afdd107e21 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -275,6 +275,5 @@ if {$completing_jobs != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test9.9 b/testsuite/expect/test9.9
index 6acd4bd7e856ed255b45e2ccb2e4a09fff99a8a9..f048f3b6474890c4234c658368d75697e6fec121 100755
--- a/testsuite/expect/test9.9
+++ b/testsuite/expect/test9.9
@@ -82,9 +82,4 @@ set time_took [string trim [time {_submit_jobs "test$test_id" "/dev/null"}] " pe
set jobs_per_sec [expr $job_cnt * 1000000 / $time_took]
send_user "Ran $job_cnt jobs in $time_took microseconds or $jobs_per_sec jobs per second\n"
-if { $exit_code != 0 } {
- exit $exit_code
-}
-
-send_user "\nSUCCESS\n"
exit $exit_code