Skip to content
Snippets Groups Projects
Commit 54238d91 authored by Moe Jette's avatar Moe Jette
Browse files

Use slow_kill -pid to clean-up hung salloc requests (kill whole 

process group).
parent 0652b305
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 70 additions and 115 deletions
testsuite/expect/test18.10
+ 4
− 8
View file @ 54238d91
......@@ -60,13 +60,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -96,13 +94,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.11
+ 8
− 13
View file @ 54238d91
......@@ -59,13 +59,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -110,11 +108,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......@@ -151,11 +148,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......@@ -192,11 +188,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......
testsuite/expect/test18.12
+ 2
− 4
View file @ 54238d91
......@@ -68,13 +68,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.13
+ 2
− 4
View file @ 54238d91
......@@ -63,13 +63,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.14
+ 2
− 4
View file @ 54238d91
......@@ -81,13 +81,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.15
+ 2
− 4
View file @ 54238d91
......@@ -62,13 +62,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.16
+ 2
− 4
View file @ 54238d91
......@@ -171,13 +171,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.17
+ 4
− 3
View file @ 54238d91
......@@ -60,11 +60,12 @@ expect {
set job_id $expect_out(1,string)
}
timeout {
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
send_user "\nFAILURE: salloc not responding\n"
exit 1
}
}
......
testsuite/expect/test18.18
+ 2
− 4
View file @ 54238d91
......@@ -72,13 +72,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.19
+ 2
− 7
View file @ 54238d91
......@@ -7,9 +7,6 @@
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
# Note: This script generates and then deletes files in the working directory
# named test18.19.prog
############################################################################
# Copyright (C) 2002-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
......@@ -117,13 +114,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
send_user "\nEOF\n"
......
testsuite/expect/test18.21
+ 2
− 4
View file @ 54238d91
......@@ -91,13 +91,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id_1
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.22
+ 2
− 4
View file @ 54238d91
......@@ -99,13 +99,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.23
+ 2
− 4
View file @ 54238d91
......@@ -60,13 +60,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.25
+ 2
− 3
View file @ 54238d91
......@@ -66,11 +66,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
}
......
testsuite/expect/test18.26
+ 4
− 8
View file @ 54238d91
......@@ -87,13 +87,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -150,13 +148,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.27
+ 4
− 8
View file @ 54238d91
......@@ -68,13 +68,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -116,13 +114,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.28
+ 2
− 3
View file @ 54238d91
......@@ -78,11 +78,10 @@ for {set inx 1} {$inx <= 4} {set inx [expr $inx * 2]} {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......
testsuite/expect/test18.29
+ 10
− 4
View file @ 54238d91
......@@ -77,8 +77,12 @@ expect {
set jobid $expect_out(1,string)
}
timeout {
slow_kill $salloc_pid
set exit_code 1
send_user "\nFAILURE: salloc not responding\n"
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
}
expect {
......@@ -86,8 +90,10 @@ expect {
set cpu_cnt $expect_out(1,string)
}
timeout {
slow_kill $salloc_pid
set exit_code 1
send_user "\nFAILURE: salloc not responding\n"
cancel_job $job_id
slow_kill [expr 0 - $salloc_pid]
exit 1
}
}
file delete $script_name
......
testsuite/expect/test18.30
+ 4
− 8
View file @ 54238d91
......@@ -93,13 +93,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -154,13 +152,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
testsuite/expect/test18.31
+ 8
− 14
View file @ 54238d91
......@@ -98,11 +98,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......@@ -180,11 +179,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
exit 1
}
eof {
......@@ -243,13 +241,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......@@ -300,13 +296,11 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
if {$job_id == 0} {
slow_kill $salloc_pid
} else {
if {$job_id != 0} {
cancel_job $job_id
}
slow_kill [expr 0 - $salloc_pid]
set exit_code 1
exp_continue
}
eof {
wait
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung