From 7ab563a73a59e43d6c90317981a4961a82734a96 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 28 Mar 2012 10:04:57 -0700
Subject: [PATCH] Modify test to work in both RedHat and Ubuntu
---
testsuite/expect/test1.89 | 10 ++++++++--
testsuite/expect/test1.90 | 20 +++++++++++++++++++-
testsuite/expect/test1.91 | 10 +++++++++-
3 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 15413c8eba6..3cb4b7cb9f4 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -90,10 +90,16 @@ exec $bin_chmod 700 $file_prog
#
# Create an allocation
#
-global env
-set env(PS1) $prompt
set salloc_pid [spawn $salloc -N1 --exclusive --verbose -t2 $bin_bash]
expect {
+ -re "Granted job allocation ($number)" {
+ set job_id $expect_out(1,string)
+ send "export PS1=\"$prompt\"\r"
+ exp_continue
+ }
+ -re "export PS1=\"$prompt\"" {
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: salloc not responding "
send_user "or failure to recognize prompt\n"
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index ca76902996b..7e6182cf532 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -36,6 +36,7 @@ source ./globals
set test_id "1.90"
set exit_code 0
set file_prog "test$test_id.prog"
+set prompt "PROMPT:"
print_header $test_id
@@ -109,11 +110,28 @@ exec $bin_chmod 700 $file_prog
# Create an allocation
#
set salloc_pid [spawn $salloc -N1 --exclusive --verbose -t2 $bin_bash]
+expect {
+ -re "Granted job allocation ($number)" {
+ set job_id $expect_out(1,string)
+ send "export PS1=\"$prompt\"\r"
+ exp_continue
+ }
+ -re "export PS1=\"$prompt\"" {
+ exp_continue
+ }
+ timeout {
+ send_user "\nFAILURE: salloc not responding "
+ send_user "or failure to recognize prompt\n"
+ slow_kill $salloc_pid
+ exit 1
+ }
+ -re $prompt {
+ }
+}
#
# Run a job step to get allocated processor count and affinity
#
-expect -re $prompt
set full_mask -1
set timeout $max_job_delay
send "$srun -c1 $file_prog\r"
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index eed7756cb96..8ff3332e1d0 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -145,10 +145,17 @@ exec $bin_chmod 700 $file_prog
# Create an allocation
#
global env
-set env(PS1) $prompt
set env(SLURM_CPU_BIND) "verbose"
set salloc_pid [spawn $salloc -w $node_name -N1 --exclusive --verbose -t2 $bin_bash]
expect {
+ -re "Granted job allocation ($number)" {
+ set job_id $expect_out(1,string)
+ send "export PS1=\"$prompt\"\r"
+ exp_continue
+ }
+ -re "export PS1=\"$prompt\"" {
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: salloc not responding "
send_user "or failure to recognize prompt\n"
@@ -158,6 +165,7 @@ expect {
-re $prompt {
}
}
+
#############################################################################
#
# Run a job step to get allocated processor count and affinity
--
GitLab