From c75ffaebb9cd772eaa6e287bb9237b0c7fdf0d86 Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Fri, 12 May 2006 22:19:11 +0000
Subject: [PATCH] Fix test3.7 on systems where suspend is not supported
---
testsuite/expect/globals | 6 +++---
testsuite/expect/test3.7 | 19 +++++++++++--------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index ab2d6eb79ec..c079ca37475 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -316,7 +316,7 @@ proc wait_for_file { file_name } {
################################################################
proc wait_for_job { job_id state } {
- global bin_sleep max_job_delay
+ global max_job_delay
global scontrol
set is_done 0
set is_running 0
@@ -366,7 +366,7 @@ proc wait_for_job { job_id state } {
log_user 1
if {[string compare $state "DONE"] == 0 && $is_done == 1 } {
- exec $bin_sleep 2
+ sleep 2
return 0
}
if {[string compare $state "RUNNING"] == 0 && $is_running == 1 } {
@@ -376,7 +376,7 @@ proc wait_for_job { job_id state } {
return 1
}
- exec $bin_sleep $sleep_time
+ sleep $sleep_time
set sleep_time [expr $sleep_time * 2]
if { $sleep_time > 10 } {
set sleep_time 10
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index 096c0cd5ba6..9b1d1a8afcb 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -139,13 +139,11 @@ proc check_output { file_name } {
#
# Delete left-over program and rebuild it
#
-exec $bin_rm -f $file_prog $file_prog_sh1 $file_prog_sh2 $file_out1 $file_out2
-exec echo "#!/bin/sh" > $file_prog_sh1
-exec echo "$srun ./$file_prog" >> $file_prog_sh1
-exec echo "#!/bin/sh" > $file_prog_sh2
-exec echo "./$file_prog" >> $file_prog_sh2
+file delete $file_prog $file_out1 $file_out2
+make_bash_script $file_prog_sh1 "$srun ./$file_prog"
+make_bash_script $file_prog_sh2 "./$file_prog"
exec $bin_make -f /dev/null $file_prog
-exec $bin_chmod 700 $file_prog $file_prog_sh1 $file_prog_sh2
+exec $bin_chmod 700 $file_prog
#
# Submit two jobs to the same node
@@ -228,15 +226,20 @@ if {$job_id2 == 0} {
# The sleep commands are added so the program can recognize
# that it has been suspended.
#
-exec $bin_sleep 5
+sleep 5
suspend_job $job_id1 suspend
+if {$not_supported == 1} {
+ exec $scancel $job_id1
+ exec $scancel $job_id2
+ exit 0
+}
if {$not_supported == 0} {
if {[wait_for_job $job_id2 RUNNING] != 0} {
send_user "\nFAILURE: waiting for job $job_id2 to run\n"
kill_srun
exit 1
}
- exec $bin_sleep 5
+ sleep 5
suspend_job $job_id2 suspend
suspend_job $job_id1 resume
if {[wait_for_job $job_id1 DONE] != 0} {
--
GitLab