diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92 index 5d4f5a46fe4186af7127942cafb2871bc8a1252d..03c94517b4de07a24f0db8ac5f56d7a76171f677 100755 --- a/testsuite/expect/test1.92 +++ b/testsuite/expect/test1.92 @@ -70,7 +70,7 @@ expect { exit 0 } -re $prompt { - send "$srun -l -c1 ./$file_bash | sort -V\r" + send "$srun -l -c1 ./$file_bash | $bin_sort -V\r" } timeout { send_user "\nFAILURE: salloc not responding\n" @@ -135,7 +135,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 -V\r" +send "$srun -l -n $task_cnt -m block ./$file_bash | $bin_sort -V\r" expect { -re "nodeid:($number) taskid:($number) localid:($number)" { set this_node $expect_out(1,string) @@ -185,7 +185,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 -V\r" +send "$srun -l -n $task_cnt -m cyclic ./$file_bash | $bin_sort -V\r" expect { -re "nodeid:($number) taskid:($number) localid:($number)" { set this_node $expect_out(1,string) @@ -235,7 +235,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 -V\r" +send "$srun -l -n $task_cnt -m plane=$block_size ./$file_bash | $bin_sort -V\r" expect { -re "nodeid:($number) taskid:($number) localid:($number)" { set this_node $expect_out(1,string) diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97 index 2b06be75c87ca577492526d4f9d3f52ec4b5cb3f..0a975815ce63f50ac8fab43daf54bf71326b0aa2 100755 --- a/testsuite/expect/test1.97 +++ b/testsuite/expect/test1.97 @@ -224,12 +224,13 @@ proc submit_cpu {ntasks ncpus} { global srun bin_printenv nodelist exit_code num_nodes tasks nodes global bin_bash number alpha_numeric_nodelist wait_for_job + global bin_sort bin_uniq # Wait awhile for the jobs to cleanup sleep 2 set x 0 - spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks -w$nodelist -c$ncpus --exclusive $bin_printenv SLURMD_NODENAME | sort -V | uniq -c" + spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks -w$nodelist -c$ncpus --exclusive $bin_printenv SLURMD_NODENAME | $bin_sort -V | $bin_uniq -c" expect { -re "($number) ($alpha_numeric_nodelist)" { set tasks($x) $expect_out(1,string) @@ -256,12 +257,13 @@ proc submit_tasks {ntasks ntaskpn} { global srun bin_printenv nodelist exit_code num_nodes tasks nodes bin_bash global number alpha_numeric_nodelist + global bin_sort bin_uniq # Wait awhile for the jobs to clean up sleep 2 set x 0 - spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks --ntasks-per-node=$ntaskpn -w$nodelist --exclusive $bin_printenv SLURMD_NODENAME | sort -V | uniq -c" + spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks --ntasks-per-node=$ntaskpn -w$nodelist --exclusive $bin_printenv SLURMD_NODENAME | $bin_sort -V | $bin_uniq -c" expect { -re "($number) ($alpha_numeric_nodelist)" { set tasks($x) $expect_out(1,string) diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24 index 84a2c39d0c87d5c8dd4884757d584cb90dad460d..ad5fa374e0550ea83667beb417a390ca3d944686 100755 --- a/testsuite/expect/test15.24 +++ b/testsuite/expect/test15.24 @@ -60,7 +60,7 @@ if {[test_alps]} { # file delete $file_in $file_out make_bash_script $file_in " - env | grep SLURM | sort + $bin_env | grep SLURM | $bin_sort $srun $bin_id" # diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32 index 3d4beb18f2e4f76b48c20b79ca68eeb32d9c647f..26caeb7eb5113f58833159f4f0c4476521c84bc3 100755 --- a/testsuite/expect/test17.32 +++ b/testsuite/expect/test17.32 @@ -50,7 +50,7 @@ if {[test_alps]} { # file delete $file_in $file_out make_bash_script $file_in " - env | grep SLURM | sort + $bin_env | grep SLURM | $bin_sort $srun $bin_id" #