From a3c4239b0a2a02fcf9be6c9d4390e3d048c3e67a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 14 Sep 2007 20:05:07 +0000
Subject: [PATCH] svn merge -r12320:12327
https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
---
testsuite/expect/test1.91 | 24 ++++++++++++------------
testsuite/expect/test1.92 | 12 ++++++------
2 files changed, 18 insertions(+), 18 deletions(-)
mode change 100644 => 100755 testsuite/expect/test1.92
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index f091f175e2c..cc33edd4349 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -93,7 +93,7 @@ send_user "Node config: Sockets=$num_sockets Cores=$num_cores Threads=$num_threa
# Build a test program to report affinity by task
#
exec $bin_rm -f $file_prog
-exec $bin_cc -I$build_dir $file_prog.c -o $file_prog
+exec $bin_make -f /dev/null $file_prog
exec $bin_chmod 700 $file_prog
#
@@ -101,7 +101,7 @@ exec $bin_chmod 700 $file_prog
#
global env
set env(SLURM_CPU_BIND) "verbose"
-set salloc_pid [spawn $salloc -N1 --exclusive --verbose -t2 $bin_bash]
+set srun_pid [spawn $srun --allocate -N1 --exclusive --verbose -t2]
#############################################################################
#
@@ -123,9 +123,9 @@ expect {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
- slow_kill $salloc_pid
+ slow_kill $srun_pid
exit 1
}
-re $prompt
@@ -149,7 +149,7 @@ expect {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -191,7 +191,7 @@ while {$this_cnt <= $num_sockets} {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -241,7 +241,7 @@ while {$this_cnt <= $num_cores} {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -291,7 +291,7 @@ while {$this_cnt <= $num_threads} {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -340,7 +340,7 @@ while {$this_cnt <= $task_cnt} {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -376,7 +376,7 @@ expect {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
set exit_code 1
}
@@ -398,9 +398,9 @@ expect {
set exit_code 1
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
- slow_kill $salloc_pid
+ slow_kill $srun_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
old mode 100644
new mode 100755
index f9500c9aeab..c742424d3ca
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -51,7 +51,7 @@ exit 0
#
# Create an allocation
#
-set salloc_pid [spawn $salloc -N2 --verbose -t2 $bin_bash]
+set srun_pid [spawn $srun --allocate -N2 --verbose -t2]
expect {
-re "More ($alpha) requested than permitted" {
send_user "\nWARNING: can't test srun task distribution\n"
@@ -62,7 +62,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- slow_kill $salloc_pid
+ slow_kill $srun_pid
exit 1
}
}
@@ -92,9 +92,9 @@ expect {
exp_continue
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
- slow_kill $salloc_pid
+ slow_kill $srun_pid
exit 1
}
-re $prompt
@@ -269,9 +269,9 @@ expect {
set exit_code 1
}
timeout {
- send_user "\nFAILURE: salloc not responding "
+ send_user "\nFAILURE: srun (from --allocate) not responding "
send_user "or failure to recognize prompt\n"
- slow_kill $salloc_pid
+ slow_kill $srun_pid
set exit_code 1
}
eof {
--
GitLab