From 226285c5677a9ee85aacbe6f3f0aa68956506a4f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 9 Sep 2014 13:50:14 -0700
Subject: [PATCH] Fix test for Cray systems
---
testsuite/expect/test1.14 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index c229d9a947a..d9c0182a944 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -40,6 +40,14 @@ set file_out "test$test_id.output"
set job_id 0
set sleep_secs 10
+# On a cray system we might only be able to run 2 tasks per node so force it
+# to always assume this is the case.
+if { [test_cray] } {
+ set extra "export SLURM_TASKS_PER_NODE=2"
+} else {
+ set extra ""
+}
+
print_header $test_id
@@ -62,6 +70,7 @@ if {[test_launch_poe]} {
#
exec $bin_rm -f $file_in $file_in2 $file_out
make_bash_script $file_in "
+ $extra
echo tasks_per_node=\$SLURM_TASKS_PER_NODE
inx=0
while \[ \$inx -lt \$SLURM_TASKS_PER_NODE \]
@@ -153,6 +162,7 @@ if {$exit_code == 0} {
#
exec $bin_rm -f $file_in $file_out
make_bash_script $file_in "
+ $extra
inx=0
while \[ \$inx -lt \$SLURM_TASKS_PER_NODE \]
do
--
GitLab