From eb435fec1705d4c6e94d1de8f08c628542d1e551 Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Tue, 26 Sep 2006 19:46:39 +0000
Subject: [PATCH] Possibly fix test15.5.
---
testsuite/expect/test15.5 | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index bc158e71f97..0f386979486 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -68,11 +68,14 @@ if {$kill_wait > 60} {
# Build input script file
#
make_bash_script $file_in "
- trap \"\" SIGINT
- $srun $bin_sleep $sleep_time
+ $bin_sleep $sleep_time
$bin_echo FINI
"
+proc date {} {
+ send_user "local time: [exec date]\n"
+}
+
#
# Execute a couple of three minute jobs; one with a one minute time
# limit and the other with a four minute time limit. Confirm jobs
@@ -86,14 +89,24 @@ make_bash_script $file_in "
#
set timeout [expr $max_job_delay + $sleep_time]
set job_id 0
-set salloc_pid [spawn $salloc -t1 --kill-command ./$file_in]
+set salloc_pid [spawn $salloc -t1 --kill-command=KILL ./$file_in]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
+ date
+ exp_continue
+ }
+ -re "Job allocation time limit to be reached at" {
+ date
+ exp_continue
+ }
+ -re "Job allocation ($number) has been revoked." {
+ date
exp_continue
}
-re "FINI" {
send_user "\nFAILURE: job time limit not honored\n"
+ date
set exit_code 1
exp_continue
}
@@ -112,13 +125,23 @@ expect {
set completions 0
set job_id 0
-set salloc_pid [spawn $salloc -t4 --kill-command ./$file_in]
+set salloc_pid [spawn $salloc -t4 --kill-command=KILL ./$file_in]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
+ date
+ exp_continue
+ }
+ -re "Job allocation time limit to be reached at" {
+ date
+ exp_continue
+ }
+ -re "Job allocation ($number) has been revoked." {
+ date
exp_continue
}
-re "FINI" {
+ date
incr completions
exp_continue
}
--
GitLab