diff --git a/NEWS b/NEWS index de704625d90f399ce82955081115efeae9f851f5..075bede7bc8dd7245a949fd86c004348f66d5640 100644 --- a/NEWS +++ b/NEWS @@ -182,6 +182,9 @@ documents those changes that are of interest to users and admins. -- BLUEGENE - add support for scontrol show blocks. -- Added support for job step time limits. +* Changes in SLURM 2.0.6 +======================== + * Changes in SLURM 2.0.5 ======================== -- BLUEGENE - Added support for emulating systems with a X-dimension of 4. diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59 index c6ee7cd315f806e46e0ae5365f03427dbbc5daf6..6ad5da11376e79ef7d419eeb69fc6995e689c2cf 100755 --- a/testsuite/expect/test1.59 +++ b/testsuite/expect/test1.59 @@ -117,7 +117,7 @@ for {set i 0} {$i<4} {incr i} { previous srun\n" exit 1 } - send "export SLURM_HOSTFILE=$hostfile\n" + send "export SLURM_HOSTFILE=$hostfile\r" expect { -re $prompt { #send_user "srun completed\n" @@ -175,7 +175,7 @@ for {set i 0} {$i<4} {incr i} { # # execute srun with a specific node count # - send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\n" + send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\r" expect { -re "($number): ($alpha_numeric_under)" { set task_id $expect_out(1,string) @@ -256,7 +256,7 @@ for {set i 0} {$i<4} {incr i} { } } } -send "unset SLURM_HOSTFILE\n" +send "unset SLURM_HOSTFILE\r" expect { -re $prompt { #send_user "srun completed\n" @@ -327,7 +327,7 @@ for {set i 0} {$i<5} {incr i} { # execute srun with a specific node count # - send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\n" + send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\r" expect { -re "($number): ($alpha_numeric_under)" { @@ -406,7 +406,7 @@ for {set i 0} {$i<5} {incr i} { } } -send "exit\n" +send "exit\r" expect { -re "error.*Exit 1" { send_user "This error is expected, no worries\n"