From 4aff263c76716264b3b2cb1b9ed272faff2b736a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 18 Nov 2005 23:16:22 +0000
Subject: [PATCH] Modify tests to support MPICH-2 with PMI.
---
testsuite/expect/globals.example | 10 ++++++++--
testsuite/expect/test1.88 | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/globals.example b/testsuite/expect/globals.example
index bacb960a3bc..9769ee62fb8 100755
--- a/testsuite/expect/globals.example
+++ b/testsuite/expect/globals.example
@@ -40,8 +40,14 @@ set smap "${slurm_dir}/bin/smap"
set squeue "${slurm_dir}/bin/squeue"
set srun "${slurm_dir}/bin/srun"
-set poe "/usr/bin/poe"
-set mpicc "/usr/local/bin/mpicc"
+# If using MPICH-2 or other version of MPI requiring pmi libary, use this
+#set mpicc "/home/jette/mpich2-install/bin/mpicc"
+#set use_pmi 1
+# OR for other versions of MPICH, use this
+set mpicc "/usr/local/bin/mpicc"
+set use_pmi 0
+
+set poe "/usr/bin/poe"
set mpirun "mpirun"
set totalviewcli "/usr/local/bin/totalviewcli"
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 03ccd8159bc..d3df20a279a 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -65,7 +65,13 @@ if {[test_front_end] != 0} {
# Delete left-over program and rebuild it
#
exec $bin_rm -f $test_prog ${test_prog}.o
-exec $mpicc -o $test_prog ${test_prog}.c
+if {$use_pmi} {
+ set pmi_link "-rpath $slurm_dir/lib -L $slurm_dir/lib -lpmi"
+ exec $mpicc -Xlinker $pmi_link -o $test_prog ${test_prog}.c
+} else {
+ exec $mpicc -o $test_prog ${test_prog}.c
+}
+
#
# Delete left-over input script plus stdout/err files
--
GitLab