From 121324e14594cca6567a1ab18bfc6d3ce811c381 Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Wed, 6 Jun 2007 22:22:27 +0000
Subject: [PATCH] Adapt more tests to srun's removed --batch options.
---
testsuite/expect/test2.11 | 6 +++---
testsuite/expect/test2.7 | 4 ++--
testsuite/expect/test2.8 | 12 ++++++------
testsuite/expect/test3.4 | 4 ++--
testsuite/expect/test3.7 | 8 ++++----
testsuite/expect/test3.8 | 12 ++++++------
testsuite/expect/test5.4 | 12 ++++++------
testsuite/expect/test5.5 | 12 ++++++------
testsuite/expect/test5.6 | 12 ++++++------
testsuite/expect/test6.10 | 8 ++++----
testsuite/expect/test6.11 | 6 +++---
testsuite/expect/test6.12 | 20 ++++++++++----------
testsuite/expect/test6.13 | 12 ++++++------
testsuite/expect/test6.3 | 6 +++---
testsuite/expect/test6.4 | 12 ++++++------
testsuite/expect/test6.5 | 12 ++++++------
testsuite/expect/test6.7 | 12 ++++++------
testsuite/expect/test6.8 | 14 +++++++-------
testsuite/expect/test6.9 | 8 ++++----
testsuite/expect/test7.1 | 22 ++++++++++++----------
20 files changed, 108 insertions(+), 106 deletions(-)
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index 9457b7f2f61..dc6696141e2 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -57,15 +57,15 @@ make_bash_script $file_in "
#
# Spawn a srun batch job that uses stdout/err and confirm their contents
#
-set srun_pid [spawn $srun --batch --output=$file_out -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index 62b163988d2..7642c409bf8 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -52,9 +52,9 @@ make_bash_script $file_in "$scontrol pidinfo \$\$"
#
# Spawn a srun batch job that uses stdout/err and confirm their contents
#
-set srun_pid [spawn $srun --batch --output=$file_out --error=$file_err -t1 $file_in]
+set srun_pid [spawn $sbatch --output=$file_out --error=$file_err -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index 182dc812769..4ab858bf688 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -50,15 +50,15 @@ make_bash_script $file_in "
#
# Submit a couple jobs so we have something to work with
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -70,16 +70,16 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
cancel_job $job_id1
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index d968f266df2..6ec92ae1c0b 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -49,9 +49,9 @@ make_bash_script $file_in "$srun $bin_sleep 60"
#
# Submit a job so we have something to work with
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t1 --hold $file_in]
+set srun_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t1 --hold $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index 1e0d425c4f3..2ac49563e11 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -122,9 +122,9 @@ exec $bin_chmod 700 $file_prog
#
# Submit two jobs to the same node
#
-set srun_pid [spawn $srun --batch -N1 -t1 --output=$file_out1 $file_prog_sh1]
+set srun_pid [spawn $sbatch -N1 -t1 --output=$file_out1 $file_prog_sh1]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
@@ -171,9 +171,9 @@ if {[string compare $host_name ""] == 0} {
exit 1
}
# Submit another job to that same node
-set srun_pid [spawn $srun --batch -N1 -t1 --output=$file_out2 $file_prog_sh2]
+set srun_pid [spawn $sbatch -N1 -t1 --output=$file_out2 $file_prog_sh2]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
diff --git a/testsuite/expect/test3.8 b/testsuite/expect/test3.8
index 0bd675e1f7b..c734bce9064 100755
--- a/testsuite/expect/test3.8
+++ b/testsuite/expect/test3.8
@@ -84,15 +84,15 @@ if { [test_bluegene] } {
# Spawn a srun batch job that uses stdout/err and confirm their contents
#
set timeout $max_job_delay
-set srun_pid [spawn $srun -N$node_cnt --batch --output=$file_out --error=$file_err -t1 $file_in]
+set sbatch_pid [spawn $sbatch -N$node_cnt --output=$file_out --error=$file_err -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
@@ -184,15 +184,15 @@ set job_id 0
exec $bin_rm -f $file_flag_1 $file_flag_2 $file_flag_3 $file_flag_4
-set srun_pid [spawn $srun --no-requeue --batch --output=$file_out --error=$file_err -t1 $file_in]
+set sbatch_pid [spawn $sbatch --no-requeue --output=$file_out --error=$file_err -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index c22a345a073..ce029c466e1 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -48,15 +48,15 @@ make_bash_script $file_in "$srun $bin_sleep 90"
#
# Submit a couple of job so we have something to look at
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -68,15 +68,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --hold -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --hold -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index 0a33aa2b26e..5caf1964ae8 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -49,15 +49,15 @@ make_bash_script $file_in "$srun $bin_sleep 10"
#
# Submit a couple of jobs so we have something to look at
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=$job_name1 -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=$job_name1 -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -69,15 +69,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=$job_name2 --hold -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=$job_name2 --hold -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index c9d9c88056c..039985da221 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -52,15 +52,15 @@ if { [test_bluegene] } {
#
# Submit a couple of job so we have something to look at
#
-set srun_pid [spawn $srun --batch -N$node_cnt --output=/dev/null --error=/dev/null -t5 $file_in]
+set sbatch_pid [spawn $sbatch -N$node_cnt --output=/dev/null --error=/dev/null -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -72,15 +72,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch -N$node_cnt --output=/dev/null --error=/dev/null --hold -t5 $file_in]
+set sbatch_pid [spawn $sbatch -N$node_cnt --output=/dev/null --error=/dev/null --hold -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
cancel_job $job_id1
exit 1
}
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index f5efd09425f..6794d707df6 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -71,17 +71,17 @@ if { $got_login == 0 } {
make_bash_script $file_in "$srun $bin_sleep $max_job_delay"
#
-# Spawn a srun batch job
+# Spawn a sbatch job
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --hold -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --hold -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index 64b30d75552..502374d6456 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -41,15 +41,15 @@ print_header $test_id
#
# Submit a job so we have something to work with
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --hold -t1 $bin_id]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --hold -t1 $bin_id]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index bb10a827a11..0307a2dcfe9 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -73,18 +73,18 @@ done
"
#
-# Spawn a srun batch job with arguments
+# Spawn a sbatch job with arguments
#
set timeout $max_job_delay
-set srun_pid [spawn $srun --batch --output=$file_out --error=$file_err -t2 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out --error=$file_err -t2 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -158,15 +158,15 @@ file delete $file_out $file_err
make_bash_script $file_in "$bin_sleep 500"
set job_id 0
-set srun_pid [spawn $srun --batch --output=$file_out --error=$file_err -t2 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out --error=$file_err -t2 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -236,15 +236,15 @@ set job_id 0
file delete $file_out $file_err
make_bash_script $file_in "$srun $bin_sleep 500"
-set srun_pid [spawn $srun --batch --output=$file_out --error=$file_err -t2 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out --error=$file_err -t2 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index b939416850e..4d273d8e130 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -55,15 +55,15 @@ make_bash_script $file_in "
# Submit a job so we have something to work with
#
set job_id 0
-set srun_pid [spawn $srun --batch --output=$file_out -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
exp_continue
}
@@ -161,15 +161,15 @@ make_bash_script $file_in "
# Submit a job so we have something to work with
#
set job_id 0
-set srun_pid [spawn $srun --batch --output=$file_out -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index 3ee399fd02a..c3ee1ff330a 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -47,15 +47,15 @@ make_bash_script $file_in "$srun $bin_sleep 600"
#
# Submit a job so we have something to work with
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index 8065dd1f6ab..de5a4ae8c15 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -47,15 +47,15 @@ make_bash_script $file_in "$srun $bin_sleep 10"
#
# Submit a couple of jobs so we have something to work with
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=job1 -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=job1 -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
@@ -67,15 +67,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=job2 -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=job2 -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 17d81980862..777b03c59a9 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -49,15 +49,15 @@ make_bash_script $file_in "$srun $bin_sleep 10"
# Submit a couple of jobs so we have something to work with
#
set timeout 10
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
@@ -69,15 +69,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index 2e89e959c22..c3b363f8e33 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -54,15 +54,15 @@ make_bash_script $file_in "
# Submit a job so we have something to work with
#
set job_id 0
-set srun_pid [spawn $srun --batch --output=$file_out -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
@@ -159,15 +159,15 @@ make_bash_script $file_in "
# Submit a job so we have something to work with
#
set job_id 0
-set srun_pid [spawn $srun --batch --output=$file_out -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=$file_out -t1 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill srun_pid
+ slow_kill sbatch_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 006285d458e..e270c069634 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -48,17 +48,17 @@ print_header $test_id
make_bash_script $file_in "$srun $bin_sleep $max_job_delay"
#
-# Spawn a couple of srun batch jobs
+# Spawn a couple of sbatch jobs
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=job.$test_id --hold -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=job.$test_id --hold -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
@@ -70,15 +70,15 @@ if {$job_id1 == 0} {
exit 1
}
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=job.$test_id -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=job.$test_id -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index b9c7c699af6..f331391f6ff 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -52,17 +52,17 @@ make_bash_script $file_in "
"
#
-# Spawn srun batch job
+# Spawn sbatch job
#
-set srun_pid [spawn $srun --batch --output=/dev/null --error=/dev/null --job-name=job.$test_id -t5 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --job-name=job.$test_id -t5 $file_in]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index b4313b88f0b..ed35e73a0fd 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -42,48 +42,50 @@ set prio3 -1
print_header $test_id
+make_bash_script "pwd_script" { $bin_pwd }
+
#
-# Spawn three srun batch job, one held
+# Spawn three sbatch job, one held
#
-set srun_pid [spawn $srun --batch -t1 --output=/dev/null --error=/dev/null $bin_pwd]
+set sbatch_pid [spawn $sbatch -t1 --output=/dev/null --error=/dev/null pwd_script]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
wait
}
}
-set srun_pid [spawn $srun --batch -t1 --output=/dev/null --error=/dev/null $bin_pwd]
+set sbatch_pid [spawn $sbatch -t1 --output=/dev/null --error=/dev/null pwd_script]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id2 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
wait
}
}
-set srun_pid [spawn $srun --batch -t1 --output=/dev/null --error=/dev/null --hold $bin_pwd]
+set sbatch_pid [spawn $sbatch -t1 --output=/dev/null --error=/dev/null --hold pwd_script]
expect {
- -re "jobid ($number) submitted" {
+ -re "Submitted batch job ($number)" {
set job_id3 $expect_out(1,string)
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $srun_pid
+ slow_kill $sbatch_pid
exit 1
}
eof {
--
GitLab