From a33dd91c5d67ad38c43b518e3e6d1127f5e08921 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 23 Nov 2015 13:59:57 -0800
Subject: [PATCH] Change tests to use bin_sort and bin_uniq instead of the
direct command calls.
---
testsuite/expect/test1.92 | 8 ++++----
testsuite/expect/test1.97 | 6 ++++--
testsuite/expect/test15.24 | 2 +-
testsuite/expect/test17.32 | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 5d4f5a46fe4..03c94517b4d 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 2b06be75c87..0a975815ce6 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 84a2c39d0c8..ad5fa374e05 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 3d4beb18f2e..26caeb7eb51 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"
#
--
GitLab