Modify tests to support MPICH-2 with PMI.

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"
 

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