diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index 3769788f4e3cf4d233d07eb0f79df93b82512b37..c6ab9f48246a258d30a5bcbd183b665aeb211752 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -58,7 +58,7 @@ expect {
}
-re "\[Rr\]emove .*\?" {
set matches 1
- send "y\n"
+ send "y\r"
exp_continue
}
timeout {
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 66b011474fc7368c460866acb1d3e2fc723af77b..4a0fc271edea78f7aa851e322f5522a18a07e831 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -49,7 +49,7 @@ set srun_pid [spawn $srun --input=$task_id -N1 -n10 -O -v --wait=2 -t1 $bin_bash
expect {
-re "launching ($number).0 on host" {
set job_id $expect_out(1,string)
- send "$bin_env\n"
+ send "$bin_env\r"
exp_continue
}
-re "SLURM_PROCID=($number)" {
@@ -60,7 +60,7 @@ expect {
send_user "\nFAILURE: wrong task_id responded\n"
set exit_code 1
}
- send "exit\n"
+ send "exit\r"
exp_continue
}
-re "error: First task exited" {
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index e3eb8b5af623a0ba6f048dfdabba9714a11baaed..d17c364de1850f86d95b0c42d763ffa44ed14bd6 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -103,7 +103,7 @@ exec $bin_rm -f $file_in
#
set host_0 ""
set host_1 ""
-send "srun -l $bin_printenv SLURMD_NODENAME\n"
+send "srun -l $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_inx $expect_out(1,string)
@@ -152,7 +152,7 @@ if {$exit_code != 0} {
# Exclude specific node
#
set matches 0
-send "srun -l -N1 -n1 --exclude=$host_0 $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N1 -n1 --exclude=$host_0 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
if {[string compare $expect_out(1,string) $host_1] == 0} {
@@ -189,7 +189,7 @@ if {$matches == 0} {
# Exclude specific node
#
set matches 0
-send "srun -l -N1 -n1 --exclude=$host_1 $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N1 -n1 --exclude=$host_1 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
if {[string compare $expect_out(1,string) $host_0] == 0} {
@@ -226,13 +226,13 @@ if {$matches == 0} {
# Include specific node
#
set matches 0
-send "srun -l -N1 -n1 --nodelist=$host_0 $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N1 -n1 --nodelist=$host_0 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "Requested node configuration is not available" {
send_user "\nWARNING: Appears you are using "
send_user "multiple slurmd testing.\n"
send_user "This test won't work in that fashion.\n"
- send "exit\n"
+ send "exit\r"
exit 0
}
-re "0: ($alpha_numeric_under)" {
@@ -270,7 +270,7 @@ if {$matches == 0} {
# Include specific node
#
set matches 0
-send "srun -l -N1 -n1 --nodelist=$host_1 $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N1 -n1 --nodelist=$host_1 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
if {[string compare $expect_out(1,string) $host_1] == 0} {
@@ -310,7 +310,7 @@ if {$matches == 0} {
#
set matches 0
send "srun -l -N1 -n1 --nodelist=$host_0 "
-send " --exclude=$host_0 $bin_printenv SLURMD_NODENAME\n"
+send " --exclude=$host_0 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
send_user "\nFAILURE: wrong node responded\n"
@@ -344,7 +344,7 @@ if {$matches == 0} {
# Error test: Exceed node count
#
set matches 0
-send "srun -l -N3 -n3 -O $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N3 -n3 -O $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
send_user "\nFAILURE: wrong node responded\n"
@@ -379,7 +379,7 @@ if {$matches == 0} {
#
set test_0 ""
set test_1 ""
-send "srun -l -N1-1 -n2 -O $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -N1-1 -n2 -O $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_inx $expect_out(1,string)
@@ -417,7 +417,7 @@ if {[string compare $test_0 $test_1] != 0} {
# Error test: Exceed task count, first get the processor count then exceed it
#
set processors 1
-send "srun -l -c1 $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -c1 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
incr processors
@@ -441,7 +441,7 @@ expect {
}
}
set matches 0
-send "srun -l -n $processors $bin_printenv SLURMD_NODENAME\n"
+send "srun -l -n $processors $bin_printenv SLURMD_NODENAME\r"
expect {
-re "0: ($alpha_numeric_under)" {
send_user "\nFAILURE: wrong node responded\n"
@@ -475,7 +475,7 @@ if {$matches == 0} {
#
# Post-processing
#
-send "exit\n"
+send "exit\r"
expect {
-re "error.*Exit 1" {
send_user "This error is expected, no worries\n"
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index 4890f1b04fc33936fa042fca4200e7d1d99e1940..8546373edcaf6069434533172ee2b4c72898b911 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -103,7 +103,7 @@ set host_0 ""
set host_1 ""
set host_2 ""
set host_3 ""
-send "$srun -l $bin_printenv SLURMD_NODENAME\n"
+send "$srun -l $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_num $expect_out(1,string)
@@ -168,7 +168,7 @@ if {$exit_code != 0} {
#
set matches 0
-send "$srun -l -N2 -n2 --relative=0 $bin_printenv SLURMD_NODENAME\n"
+send "$srun -l -N2 -n2 --relative=0 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_num $expect_out(1,string)
@@ -220,7 +220,7 @@ if {$matches < 2} {
# Get two nodes relative (starting at) node 2
#
set matches 0
-send "$srun -l -N2 -n2 --relative=2 $bin_printenv SLURMD_NODENAME\n"
+send "$srun -l -N2 -n2 --relative=2 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_num $expect_out(1,string)
@@ -273,7 +273,7 @@ if {$matches < 2} {
# Since there is only one node left, we check for a error message
#
set error 0
-send "$srun -l -N2 -n2 -O --relative=3 $bin_printenv SLURMD_NODENAME\n"
+send "$srun -l -N2 -n2 -O --relative=3 $bin_printenv SLURMD_NODENAME\r"
expect {
-re "error:" {
send_user "This error is expected, no worries\n"
@@ -311,7 +311,7 @@ if {$error == 0} {
#
# Post-processing
#
-send "exit\n"
+send "exit\r"
expect {
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index d847bdb1fc9e22e0ad783e9f40ca6f9a74bb8c3d..b9a9abb6c5e7a771650f4dde29f6d9477780818c 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -79,7 +79,7 @@ set salloc_pid [spawn $salloc -N1 --exclusive --verbose -t2 $bin_bash]
expect -re $prompt
set mask 0
set task_cnt 0
-send "$srun -c1 $file_prog\n"
+send "$srun -c1 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_cnt
@@ -105,7 +105,7 @@ expect {
#
set expected_mask [ expr ((1 << $task_cnt) - 1) ]
set task_mask 0
-send "$srun -c1 --cpu_bind=rank $file_prog\n"
+send "$srun -c1 --cpu_bind=rank $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -132,7 +132,7 @@ if {$task_mask != $expected_mask} {
# Run a job step with verbosity and all tasks on CPU 0
#
set task_mask 0
-send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\n"
+send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -155,7 +155,7 @@ if {$task_mask != $task_cnt} {
set exit_code 1
}
set verbose_cnt 0
-send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\n"
+send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\r"
expect {
-re "cpu_bind=MAP|cpu_bind_cores=MAP|cpu_bind_sockets=MAP|cpu_bind_threads=MAP" {
incr verbose_cnt
@@ -185,7 +185,7 @@ set cpu_cnt 0
while {$cpu_cnt < $task_cnt} {
set mask_sum 0
set mask [ expr 1 << $cpu_cnt ]
- send "$srun -c1 --cpu_bind=map_cpu:$cpu_cnt $file_prog\n"
+ send "$srun -c1 --cpu_bind=map_cpu:$cpu_cnt $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr mask_sum $expect_out(2,string)
@@ -219,7 +219,7 @@ while {$cpu_cnt < $task_cnt} {
set mask_sum 0
set mask [ expr 1 << $cpu_cnt ]
set mstr [ dec2hex $mask]
- send "$srun -c1 --cpu_bind=mask_cpu:$mstr $file_prog\n"
+ send "$srun -c1 --cpu_bind=mask_cpu:$mstr $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr mask_sum $expect_out(2,string)
@@ -295,7 +295,7 @@ send_user "alt_mask: $alt_mask\n"
# Run all tasks bound to a different CPU by specifying a forward map
#
set task_mask 0
-send "$srun -c1 --cpu_bind=map_cpu:$fwd_map $file_prog\n"
+send "$srun -c1 --cpu_bind=map_cpu:$fwd_map $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -323,7 +323,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU by specifying a reverse map
#
set task_mask 0
-send "$srun -c1 --cpu_bind=map_cpu:$rev_map $file_prog\n"
+send "$srun -c1 --cpu_bind=map_cpu:$rev_map $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -351,7 +351,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU by specifying an alternating map
#
set task_mask 0
-send "$srun -c1 --cpu_bind=map_cpu:$alt_map $file_prog\n"
+send "$srun -c1 --cpu_bind=map_cpu:$alt_map $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -379,7 +379,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU by specifying a forward mask
#
set task_mask 0
-send "$srun -c1 --cpu_bind=mask_cpu:$fwd_mask $file_prog\n"
+send "$srun -c1 --cpu_bind=mask_cpu:$fwd_mask $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -407,7 +407,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU by specifying a reverse mask
#
set task_mask 0
-send "$srun -c1 --cpu_bind=mask_cpu:$rev_mask $file_prog\n"
+send "$srun -c1 --cpu_bind=mask_cpu:$rev_mask $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -435,7 +435,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU by specifying an alternating mask
#
set task_mask 0
-send "$srun -c1 --cpu_bind=mask_cpu:$alt_mask $file_prog\n"
+send "$srun -c1 --cpu_bind=mask_cpu:$alt_mask $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -462,7 +462,7 @@ if {$task_mask != $full_mask} {
#
# Terminate the job, free the allocation
#
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
send_user "\nFAILURE: some error occurred\n"
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index c5b02164a2d2a79cdf5bee47d328e5ce132da5b1..5b208850646afa69d11270ed72a314e7c5020f9b 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -98,7 +98,7 @@ set salloc_pid [spawn $salloc -N1 --exclusive --verbose -t2 $bin_bash]
expect -re $prompt
set full_mask -1
set timeout $max_job_delay
-send "$srun -c1 $file_prog\n"
+send "$srun -c1 $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
set full_mask $expect_out(3,string)
@@ -147,7 +147,7 @@ if {$full_mask == 1} {
#
set cpu_mask 0
set mem_mask 0
-send "$srun -n $task_cnt --mem_bind=rank $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=rank $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr cpu_mask $expect_out(2,string)
@@ -176,7 +176,7 @@ if {$mem_mask != $full_mask} {
#
set task_mask 0
set verbose_cnt 0
-send "$srun -n $task_cnt --mem_bind=verbose,map_mem:0 $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=verbose,map_mem:0 $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -199,7 +199,7 @@ if {$task_mask != $task_cnt} {
set exit_code 1
}
set verbose_cnt 0
-send "$srun -n $task_cnt --mem_bind=verbose,map_mem:0 $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=verbose,map_mem:0 $file_prog\r"
expect {
-re "mem_bind=MAP" {
incr verbose_cnt
@@ -225,7 +225,7 @@ if {$verbose_cnt != $task_cnt} {
#
# Run all tasks all bound to the same CPU's memory (local CPU)
#
-send "$srun -n $task_cnt --cpu_bind=rank --mem_bind=local $file_prog\n"
+send "$srun -n $task_cnt --cpu_bind=rank --mem_bind=local $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
if {$expect_out(2,string) != $expect_out(3,string)} {
@@ -255,7 +255,7 @@ set cpu_cnt 0
while {$cpu_cnt < $task_cnt} {
set mask_sum 0
set mask [ expr 1 << $cpu_cnt ]
- send "$srun -n $task_cnt --mem_bind=map_mem:$cpu_cnt $file_prog\n"
+ send "$srun -n $task_cnt --mem_bind=map_mem:$cpu_cnt $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr mask_sum $expect_out(3,string)
@@ -289,7 +289,7 @@ while {$cpu_cnt < $task_cnt} {
set mask_sum 0
set mask [ expr 1 << $cpu_cnt ]
set mstr [ dec2hex $mask]
- send "$srun -n $task_cnt --mem_bind=mask_mem:$mstr $file_prog\n"
+ send "$srun -n $task_cnt --mem_bind=mask_mem:$mstr $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr mask_sum $expect_out(3,string)
@@ -365,7 +365,7 @@ send_user "alt_mask: $alt_mask\n"
# Run all tasks bound to a different CPU's memory by specifying a forward map
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=map_mem:$fwd_map $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=map_mem:$fwd_map $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -393,7 +393,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU's memory by specifying a reverse map
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=map_mem:$rev_map $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=map_mem:$rev_map $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -421,7 +421,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU's memroy by specifying an alternating map
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=map_mem:$alt_map $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=map_mem:$alt_map $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -449,7 +449,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU's memory by specifying a forward mask
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=mask_mem:$fwd_mask $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=mask_mem:$fwd_mask $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -477,7 +477,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU's memory by specifying a reverse mask
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=mask_mem:$rev_mask $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=mask_mem:$rev_mask $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -505,7 +505,7 @@ if {$task_mask != $full_mask} {
# Run all tasks bound to a different CPU's memory by specifying an alternating mask
#
set task_mask 0
-send "$srun -n $task_cnt --mem_bind=mask_mem:$alt_mask $file_prog\n"
+send "$srun -n $task_cnt --mem_bind=mask_mem:$alt_mask $file_prog\r"
expect {
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
incr task_mask $expect_out(3,string)
@@ -532,7 +532,7 @@ if {$task_mask != $full_mask} {
#
# Terminate the job, free the allocation
#
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
send_user "\nFAILURE: some error occurred\n"
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index e53ce931653b6d3fe430e3ea422d3ed0998bb113..150940ac29e64a822aba8725788718ccd29b21a6 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -137,7 +137,7 @@ set salloc_pid [spawn $salloc -w $node_name -N1 --exclusive --verbose -t2 $bin_b
expect -re $prompt
set mask 0
set task_cnt 0
-send "$srun -c1 $file_prog\n"
+send "$srun -c1 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_cnt
@@ -164,7 +164,7 @@ expect {
#
set expected_mask [ expr ((1 << $task_cnt) - 1) ]
set task_mask 0
-send "$srun -c1 -n $task_cnt -B 1:1:1 $file_prog\n"
+send "$srun -c1 -n $task_cnt -B 1:1:1 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -197,7 +197,7 @@ while {$this_cnt <= $num_sockets} {
set num_tasks 0
set num_bits 0
set task_mask 0
- send "$srun -B $this_cnt-$this_cnt:$num_cores:$num_threads $file_prog\n"
+ send "$srun -B $this_cnt-$this_cnt:$num_cores:$num_threads $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -247,7 +247,7 @@ while {$this_cnt <= $num_cores} {
set num_tasks 0
set num_bits 0
set task_mask 0
- send "$srun -B $num_sockets:$this_cnt-$this_cnt:$num_threads $file_prog\n"
+ send "$srun -B $num_sockets:$this_cnt-$this_cnt:$num_threads $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -297,7 +297,7 @@ while {$this_cnt <= $num_threads} {
set num_tasks 0
set num_bits 0
set task_mask 0
- send "$srun -B $num_sockets:$num_cores:$this_cnt-$this_cnt $file_prog\n"
+ send "$srun -B $num_sockets:$num_cores:$this_cnt-$this_cnt $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -346,7 +346,7 @@ while {$this_cnt <= $task_cnt} {
set num_tasks 0
set num_bits 0
set task_mask 0
- send "$srun -c$this_cnt -B 1:1:1 $file_prog\n"
+ send "$srun -c$this_cnt -B 1:1:1 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -392,7 +392,7 @@ while {$this_cnt <= $task_cnt} {
#
set expected_mask [ expr ((1 << $task_cnt) - 1) ]
set task_mask 0
-send "$srun -n $task_cnt -m plane=4 $file_prog\n"
+send "$srun -n $task_cnt -m plane=4 $file_prog\r"
expect {
-re "TASK_ID:($number),MASK:($number)" {
incr task_mask $expect_out(2,string)
@@ -419,7 +419,7 @@ if {$task_mask != $expected_mask} {
#
# Terminate the job, free the allocation
#
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
send_user "\nFAILURE: some error occurred\n"
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index b3916a5c176b8c53d42982d3617e31fa22ab6b5a..01909d4db7dfa03fc4f5f6509f625b7e6a83637f 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -66,7 +66,7 @@ expect {
exit 0
}
-re $prompt {
- send "$srun -l -c1 $file_bash | sort -n\n"
+ send "$srun -l -c1 $file_bash | sort -n\r"
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
@@ -129,7 +129,7 @@ if {$task_cnt < (2 * $node_cnt)} {
set this_cnt 0
set prev_node -1
set this_node -1
-send "$srun -l -n $task_cnt -m block $file_bash | sort -n\n"
+send "$srun -l -n $task_cnt -m block $file_bash | sort -n\r"
expect {
-re "nodeid:($number) taskid:($number) localid:($number)" {
set this_node $expect_out(1,string)
@@ -179,7 +179,7 @@ set this_cnt 0
set prev_node -1
set this_node -1
set prev_cnt $block_size
-send "$srun -l -n $task_cnt -m cyclic $file_bash | sort -n\n"
+send "$srun -l -n $task_cnt -m cyclic $file_bash | sort -n\r"
expect {
-re "nodeid:($number) taskid:($number) localid:($number)" {
set this_node $expect_out(1,string)
@@ -229,7 +229,7 @@ set this_cnt 0
set prev_node -1
set this_node -1
set prev_cnt $block_size
-send "$srun -l -n $task_cnt -m plane=$block_size $file_bash | sort -n\n"
+send "$srun -l -n $task_cnt -m plane=$block_size $file_bash | sort -n\r"
expect {
-re "nodeid:($number) taskid:($number) localid:($number)" {
set this_node $expect_out(1,string)
@@ -274,7 +274,7 @@ if {$this_cnt != $task_cnt} {
#
# Terminate the job, free the allocation
#
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
send_user "\nFAILURE: some error occurred\n"
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index 7da5ae592c2ba3e025c8c0375c90d3035f795a12..190b7923a69b603ecbc91b0025e54a8ee48fb8d5 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -89,7 +89,7 @@ exec $bin_rm -f $file_in
#
set host_0 ""
set host_1 ""
-send "$srun -l --mpi=lam $bin_printenv SLURMD_NODENAME\n"
+send "$srun -l --mpi=lam $bin_printenv SLURMD_NODENAME\r"
expect {
-re "($number): ($alpha_numeric_under)" {
set host_inx $expect_out(1,string)
@@ -134,7 +134,7 @@ if {[string compare $host_0 $host_1] == 0} {
#
# Post-processing
#
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
send_user "\nFAILURE: Some error occured\n"
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index ce2d66d24071442285017df7034b20e1c265b11b..ef15fcee1c841477ac01918eb121791baacacd33 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -107,14 +107,14 @@ expect {
set stuff [concat $stuff "11"]
incr matches
exec sleep 1
- send "\n"
+ send "\r"
exp_continue
}
"qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj" {
# This is the bottom line of the smap box I know it
# looks wierd, but this is what expect sees it as.
# exec sleep 1
- send "\n"
+ send "\r"
exp_continue
}
timeout {
diff --git a/testsuite/expect/test10.13 b/testsuite/expect/test10.13
index 074d5e74001d6ced1bf144b8121cae38f543f7ca..8307fd2ef213e5e0e476e813ff0a4ca3a8c145f4 100755
--- a/testsuite/expect/test10.13
+++ b/testsuite/expect/test10.13
@@ -70,11 +70,11 @@ expect {
}
-re "to exit" {
if { $matches == 0 } {
- send "create 1\n"
+ send "create 1\r"
} elseif { $matches == 1 } {
- send "save $file\n"
+ send "save $file\r"
} elseif { $matches == 2 } {
- send "exit\n"
+ send "exit\r"
}
incr matches
exp_continue
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index d40029b2d7656c1643b6fd0b7ad6b92a1d838094..938a58f3f338a80f018897566871d0b16f9fe489 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -66,7 +66,7 @@ expect {
send "j"
}
if { $matches >= 3 } {
- send "\n"
+ send "\r"
}
exp_continue
}
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index 4e0f3b2ee7946ed6eb2f1d52e0dd70f676290c71..c5b9189904b1be148e9c833486e81726428a5183 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -99,7 +99,7 @@ set job_id $expect_out(1,string)
# start initial job step to claim some switch windows
expect -re $prompt
-send "$srun -N1 -O -n$windows_used $bin_sleep $step_delay &\n"
+send "$srun -N1 -O -n$windows_used $bin_sleep $step_delay &\r"
# start more job steps to check see if any switch window conflicts occur
for {set inx 0} {$inx < $windows_iterations} {incr inx} {
@@ -111,7 +111,7 @@ for {set inx 0} {$inx < $windows_iterations} {incr inx} {
}
-re $prompt {
send_user "spawning step $inx\n"
- send "$srun -N1 -O -n$windows_used true\n"
+ send "$srun -N1 -O -n$windows_used true\r"
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
@@ -130,7 +130,7 @@ for {set inx 0} {$inx < $windows_iterations} {incr inx} {
expect -re $prompt
send_user "(sleeping for $step_delay seconds, for job step zero to complete) "
exec $bin_sleep $step_delay
-send "exit\n"
+send "exit\r"
expect {
-re "error" {
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index c3ea7d82def6c76fd452dca67a38449e1374a9fd..e668cedcabea3f702d5469288a25a9d539233d51 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -46,12 +46,12 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
+ send "$scontrol show job $job_id\r"
exp_continue
}
-re "ReqProcs=($number).*" {
set tasks_get $expect_out(1,string)
- send "exit\n"
+ send "exit\r"
exp_continue
}
-re "Failed to allocate.*" {
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index 64fe0351f40e40d1d593464dc4fe59aa4b0da0ff..ae398cf9abe64425f03250d6c3a1942e0ac210e1 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -61,7 +61,7 @@ set salloc_pid [spawn $salloc -t1 --job-name=$job_name $bin_bash]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
+ send "$scontrol show job $job_id\r"
exp_continue
}
-re "Name=$job_name" {
@@ -70,7 +70,7 @@ expect {
}
-re "Priority=($number)" {
set priority1 $expect_out(1,string)
- send "exit\n"
+ send "exit\r"
exp_continue
}
timeout {
@@ -104,12 +104,12 @@ set salloc_pid [spawn $salloc -t1 --nice=1000 $bin_bash]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
+ send "$scontrol show job $job_id\r"
exp_continue
}
-re "Priority=($number)" {
set priority2 $expect_out(1,string)
- send "exit\n"
+ send "exit\r"
exp_continue
}
timeout {
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index 493376a3d2077592e002cb0aa9ea07d06ca04be1..7156228f17810ce465781ebbaf44ced126867e48 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -60,7 +60,7 @@ expect {
-re "Granted job allocation ($number)" {
send_user "\nFAILURE: salloc job submitted with invalid constraint\n"
set exit_code 1
- send "exit\n"
+ send "exit\r"
}
-re "Pending job allocation ($number)" {
send_user "\nFAILURE: salloc job submitted with invalid constraint\n"
diff --git a/testsuite/expect/test15.17 b/testsuite/expect/test15.17
index a67c2710868c22a01823364aa0e28c456b5a6440..261e1b8195e3fd7c1f75337ba01521e4cfb61ced 100755
--- a/testsuite/expect/test15.17
+++ b/testsuite/expect/test15.17
@@ -65,17 +65,17 @@ set salloc_pid [spawn $salloc -N$node_cnt -t1 $bin_bash]
expect {
-re "Granted job allocation ($number)" {
set job_id_1 $expect_out(1,string)
- send "$sbatch --jobid=$job_id_1 -o none -e none $file_in \n"
+ send "$sbatch --jobid=$job_id_1 -o none -e none $file_in \r"
exp_continue
}
-re "Submitted batch job ($number)" {
set job_id_2 $expect_out(1,string)
- send "exit \n"
+ send "exit \r"
exp_continue
}
-re "jobid ($number).0 submitted" {
set job_id_2 $expect_out(1,string)
- send "exit \n"
+ send "exit \r"
exp_continue
}
timeout {
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index 5f1cd3d76dcc30f56ab76054db8c864672c662b5..c387a358f4ec8e6742e828350d057fab53f9e910 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -71,7 +71,7 @@ set salloc_pid [spawn $salloc -N$node_cnt -t1 $srun -l $bin_printenv SLURMD_NODE
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$bin_echo MY_ID=\$SLURM_JOB_ID \n"
+ send "$bin_echo MY_ID=\$SLURM_JOB_ID \r"
exp_continue
}
-re "More processors requested than permitted" {
diff --git a/testsuite/expect/test15.23 b/testsuite/expect/test15.23
index 4d59e365be0245078847873f227e813b1d42a7ce..0631035e2b0a941dd21c882ed9ce779bd66570dc 100755
--- a/testsuite/expect/test15.23
+++ b/testsuite/expect/test15.23
@@ -59,8 +59,8 @@ expect {
}
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
- send "exit\n"
+ send "$scontrol show job $job_id\r"
+ send "exit\r"
exp_continue
}
-re "TimeLimit=($number):($number):" {
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index 71aa3281fa549be24ee1168cfeca2b0001516c9e..d6eaa21cd3273ba049731b7924010ea10bf74c89 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -50,7 +50,7 @@ set salloc_pid [spawn $salloc -t1 $bin_bash]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$bin_echo MY_ID=\$SLURM_JOB_ID \n"
+ send "$bin_echo MY_ID=\$SLURM_JOB_ID \r"
array unset expect_out
exp_continue
}
@@ -62,7 +62,7 @@ expect {
break
}
}
- send "exit 4\n"
+ send "exit 4\r"
exp_continue
}
-re "\[Ee\]xit 4" {
diff --git a/testsuite/expect/test16.4 b/testsuite/expect/test16.4
index b6b61e6a30dd99fe28b7835a2991244617ce0d98..06a09b08f071386cabb058c05227b7dafb14d4e9 100755
--- a/testsuite/expect/test16.4
+++ b/testsuite/expect/test16.4
@@ -165,7 +165,7 @@ expect {
-re "($number): WAITING" {
incr matches
if {$matches == 4} {
- send -i $attach_id "exit\n"
+ send -i $attach_id "exit\r"
}
exp_continue
}
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index f8128d5c7e0dfee165f1282c2dbb34603a59b9e4..388614b7b259882546bb17fb0ac9026456f1f680 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -56,12 +56,12 @@ expect {
-re "scontrol: " {
if {$matches == 0} {
if {$ping_sent == 0} {
- send "ping\n"
+ send "ping\r"
set ping_sent 1
}
} else {
if {$exit_sent == 0} {
- send "exit\n"
+ send "exit\r"
set exit_sent 1
}
}
@@ -95,12 +95,12 @@ expect {
-re "scontrol: " {
if {$matches == 0} {
if {$ping_sent == 0} {
- send "ping\n"
+ send "ping\r"
set ping_sent 1
}
} else {
if {$quit_sent == 0} {
- send "quit\n"
+ send "quit\r"
set quit_sent 1
}
}
@@ -135,19 +135,19 @@ expect {
-re "scontrol: " {
if {$matches == 0} {
if {$ping_sent == 0} {
- send "ping\n"
+ send "ping\r"
set ping_sent 1
}
}
if {$matches == 1} {
if {$excl_sent == 0} {
- send "!!\n"
+ send "!!\r"
set excl_sent 1
}
}
if {$matches > 1} {
if {$quit_sent == 0} {
- send "quit\n"
+ send "quit\r"
set quit_sent 1
}
}
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 30abd7c048e64040875e44f4eecd086e86af8512..8490c3d5f05234b45b699e57dd7d6e4c6c233a4c 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -138,8 +138,8 @@ spawn $salloc -N1 --account=$test_acct
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
- send "exit\n"
+ send "$scontrol show job $job_id\r"
+ send "exit\r"
exp_continue
}
-re "Account=$test_acct" {
diff --git a/testsuite/expect/test21.23 b/testsuite/expect/test21.23
index 30df0e2679cd1e7d8b4055867edd68b3d6408111..f4a55b106c49fe17f5f02babfd96212b21ccd6b7 100755
--- a/testsuite/expect/test21.23
+++ b/testsuite/expect/test21.23
@@ -144,8 +144,8 @@ spawn $salloc -N1 --account=$test_acct --wckey=$wk
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
- send "$scontrol show job $job_id\n"
- send "exit\n"
+ send "$scontrol show job $job_id\r"
+ send "exit\r"
exp_continue
}
-re "WCKey=$wk" {
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index 3dd4bdb1cd94b8f49ce4dfe839ab2ef18e5f542d..7c3a179e7460963cb0a4bf670cf3dc64ea0b4b20 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -53,7 +53,7 @@ proc scontrol_test { node proc_cnt } {
set found 0
set rc 0
- send "$scontrol show node $node\n"
+ send "$scontrol show node $node\r"
expect {
-re "AllocProcs=($number)" {
set num_alloc $expect_out(1,string)
@@ -93,7 +93,7 @@ proc sinfo_test_1 { node proc_cnt total_procs idle_cpus } {
set found 0
set rc 0
- send "$sinfo -o \"%C %A %N\" -h -n $node\n"
+ send "$sinfo -o \"%C %A %N\" -h -n $node\r"
# make sure we get by the sinfo command so we don't
# think the %'s are a prompt
expect {
@@ -170,7 +170,7 @@ proc sinfo_test_2 { node proc_cnt total_procs } {
}
set idle_nodes [expr $total_nodes - $alloc_nodes]
- send "$sinfo -o \"%t %D %N\" -h -n $node\n"
+ send "$sinfo -o \"%t %D %N\" -h -n $node\r"
# make sure we get by the sinfo command so we don't
# think the %'s are a prompt
expect {
@@ -237,22 +237,22 @@ proc allocate_and_quit { node proc_cnt total_procs } {
-re $prompt {
# test for scontrol to give me the correct cpu count
if { [scontrol_test $node $proc_cnt] } {
- send "exit\n"
+ send "exit\r"
return 1
}
# test for sinfo to give me the correct cpu count
if { [sinfo_test_1 $node $proc_cnt $total_procs $idle_cpus] } {
- send "exit\n"
+ send "exit\r"
return 1
}
# test for sinfo to give me the correct node count
if { [sinfo_test_2 $node $proc_cnt $total_procs] } {
- send "exit\n"
+ send "exit\r"
return 1
}
- send "exit\n"
+ send "exit\r"
exp_continue
}
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index 0b2286bcc215822e58500018f035b919da737ba4..30d1086e3af0bbf73f93bac11916bcab7f0949cb 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -103,7 +103,7 @@ spawn $scancel --interactive $job_id
expect {
-re "Cancel job_id=$job_id .* partition=($alpha_numeric_under) .*\? " {
set default_part $expect_out(1,string)
- send "n\n"
+ send "n\r"
exp_continue
}
timeout {
@@ -121,11 +121,11 @@ expect {
spawn $scancel --interactive --user=$my_login --partition=NO_VAL
expect {
-re "Cancel job_id=$job_id .* partition=NO_VAL .*\? " {
- send "n\n"
+ send "n\r"
exp_continue
}
-re "Cancel job_id=$job_id .* partition= .*\? " {
- send "n\n"
+ send "n\r"
send_user "\nFAILURE: scancel partition filter failure\n"
set exit_code 1
exp_continue
@@ -142,11 +142,11 @@ expect {
spawn $scancel --interactive --user=$my_login --partition=$default_part
expect {
-re "Cancel job_id=.* partition=$default_part .*\? " {
- send "n\n"
+ send "n\r"
exp_continue
}
-re "Cancel job_id=.* partition= .*\? " {
- send "n\n"
+ send "n\r"
send_user "\nFAILURE: scancel partition filter failure\n"
set exit_code 1
exp_continue
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index 44b04e279e246ddc5222541412e5cac553e398a7..a2a637527b5dbe53d86009dc2d40db982bad9607 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -81,7 +81,7 @@ expect {
exp_continue
}
-re "Cancel job.*\? " {
- send "n\n"
+ send "n\r"
incr matches
exp_continue
}
@@ -102,7 +102,7 @@ if {$exit_code != 0} {
spawn $scancel --interactive $job_id1
expect {
-re "Cancel job.*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index 06e94eb0dbfefa8aefa5302f24d2e1ff8a668faf..f3d6276bfa6fff60287f8ea080917dc395d7afb0 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -98,7 +98,7 @@ set matches 0
spawn $scancel --name=job1 --interactive
expect {
-re "Cancel job.*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
@@ -119,7 +119,7 @@ set matches 0
spawn $scancel --name=job2 --interactive
expect {
-re "Cancel job.*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 81e356a8267fab87129cc848dd40ef09a32d4576..a7dbcc21a26cf521c2b084cbc45316a05128eba0 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -112,7 +112,7 @@ set matches 0
spawn $scancel --name=job.$test_id --interactive --state=RUNNING
expect {
-re "Cancel job_id=$job_id2.*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
@@ -134,7 +134,7 @@ set matches 0
spawn $scancel --name=job.$test_id --interactive --state=PENDING
expect {
-re "Cancel job_id=$job_id1.*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 41ae263e72c679cf24ebdcbd034be9fc052ff665..3a12bc04415587bae7ca29056b5a3c132dbf344e 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -90,7 +90,7 @@ set matches 0
spawn $scancel --interactive $job_id.0
expect {
-re "Cancel step_id=$job_id.0*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
@@ -111,7 +111,7 @@ set matches 0
spawn $scancel --interactive $job_id.1
expect {
-re "Cancel step_id=$job_id.1*\? " {
- send "y\n"
+ send "y\r"
incr matches
exp_continue
}
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index 4461137f76a6a17543512b62458363c5529ae738..c9a14d0fda159d859376058bc6ae8564cb0252e5 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -106,10 +106,10 @@ expect {
-re "d1.<>" {
if {$matches == 0} {
incr matches
- send "G\n"
+ send "G\r"
}
if {$no_capability != 0} {
- send "quit\n"
+ send "quit\r"
}
exp_continue
}
@@ -120,7 +120,7 @@ expect {
}
-re "Do you want to stop the job now?.*:" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Attached to parallel task ($number)" {
@@ -129,7 +129,7 @@ expect {
}
-re "Loaded MPI support.*" {
exec sleep 2
- send "G\n"
+ send "G\r"
exp_continue
}
-re "I just received msg from Rank" {
@@ -143,12 +143,12 @@ expect {
-re "Process 1 has exited.*" {
incr matches
exec sleep 2
- send "quit\n"
+ send "quit\r"
exp_continue
}
-re "Do you really wish to exit TotalView?" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Could not open breakpoint file" {
@@ -188,10 +188,10 @@ expect {
-re "d1.<>" {
if {$matches == 0} {
incr matches
- send "G\n"
+ send "G\r"
}
if {$no_capability != 0} {
- send "quit\n"
+ send "quit\r"
}
exp_continue
}
@@ -202,7 +202,7 @@ expect {
}
-re "Do you want to stop the job now?.*:" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Attached to parallel task ($number)" {
@@ -211,7 +211,7 @@ expect {
}
-re "Loaded MPI support.*" {
exec sleep 2
- send "G\n"
+ send "G\r"
exp_continue
}
-re "I just received msg from Rank" {
@@ -225,12 +225,12 @@ expect {
-re "Process 1 has exited.*" {
incr matches
exec sleep 2
- send "quit\n"
+ send "quit\r"
exp_continue
}
-re "Do you really wish to exit TotalView?" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Could not open breakpoint file" {
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index 855e4fa5c76488fbd75a0f0841333fedacff3c33..84e5e74fd342a96099382fb75cbf6d1a3896fec1 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -136,10 +136,10 @@ expect {
-re "d1.<>" {
if {$matches == 0} {
incr matches
- send "G\n"
+ send "G\r"
}
if {$no_capability != 0} {
- send "quit\n"
+ send "quit\r"
}
exp_continue
}
@@ -150,7 +150,7 @@ expect {
}
-re "Do you want to stop the job now?.*:" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Attached to parallel task ($number)" {
@@ -159,7 +159,7 @@ expect {
}
-re "Loaded MPI support.*" {
exec sleep 2
- send "G\n"
+ send "G\r"
exp_continue
}
-re "I just received msg from Rank" {
@@ -173,12 +173,12 @@ expect {
-re "Process 1 has exited.*" {
incr matches
exec sleep 2
- send "quit\n"
+ send "quit\r"
exp_continue
}
-re "Do you really wish to exit TotalView?" {
incr matches
- send "yes\n"
+ send "yes\r"
exp_continue
}
-re "Could not open breakpoint file" {
diff --git a/testsuite/expect/test8.8 b/testsuite/expect/test8.8
index b9389dcb5981f816f79cead0903b6fae7d2c2280..7b1dec0ac3a00dea023950257f59172ff30bd4e2 100755
--- a/testsuite/expect/test8.8
+++ b/testsuite/expect/test8.8
@@ -81,7 +81,7 @@ proc allocate_and_quit { node_cnt node error_cnt check} {
set block ""
}
}
- send "exit\n"
+ send "exit\r"
exp_continue
}
-re "Unable to contact" {
@@ -213,7 +213,7 @@ proc check_node { node error_cnt alloc_cnt } {
set alloc_procs [expr $alloc_cnt * $procs_per_cnode]
set total_procs 0
set match 0
- send "$scontrol show node $node\n"
+ send "$scontrol show node $node\r"
expect {
-nocase -re " Procs=($number)" {
incr match
@@ -251,7 +251,7 @@ proc check_node { node error_cnt alloc_cnt } {
set total_cnt [expr ($total_procs / $procs_per_cnode) - $alloc_cnt - $error_cnt]
set idle_procs [expr $total_procs - $error_procs - $alloc_procs]
set match 0
- send "$sinfo -h --format \"%C %A\" -n $node\n"
+ send "$sinfo -h --format \"%C %A\" -n $node\r"
# make sure we get by the sinfo command so we don't
# think the %'s are a prompt