Merge branch 'fix-libtool-mpi-launch' into 'master'

Fix missing libtool prefix and quoting.

See merge request dkrz-sw/sct!9

tests/test_mpi_run.in

@@ -18,23 +18,32 @@ $ENV{SCT_OUT}="stdout";
 
 $ENV{SCT_PROC_CHOICE}="SCT_SELECT_ALL";
 $ENV{SCT_CALLSTATS}=0;
-#parse(run_prg("@MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi")) && check_reports();
-#run_prg("@MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi");
+#parse(run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+#run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi");
 
 # test with 1 MPI task
 
 $ENV{SCT_CALLSTATS}=1;
-#parse(run_prg("@MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+#parse(run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n 1 @abs_top_builddir@/tests/test_mpi")) && check_reports();
 
 # test with 2 MPI tasks
 
 $ENV{SCT_PROC_CHOICE}="SCT_SELECT_ALL";
 $ENV{SCT_CALLSTATS}=0;
-#parse(run_prg("@MPI_LAUNCH@ -n 2 @abs_top_builddir@/tests/test_mpi")) && check_reports();
-run_prg("@MPI_LAUNCH@ -n 2 @abs_top_builddir@/tests/test_mpi");
+#parse(run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n 2 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n 2 @abs_top_builddir@/tests/test_mpi");
 
 # test with 4 and 8 MPI tasks
 
 $ENV{SCT_PROC_CHOICE}="SCT_REDUCE_ALL";
-#parse(run_prg("@MPI_LAUNCH@ -n 4 @abs_top_builddir@/tests/test_mpi")) && check_reports();
-#parse(run_prg("@MPI_LAUNCH@ -n 8 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+#parse(run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@
+#-n 4 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+#parse(run_prg("@abs_top_builddir@/libtool --mode=execute @MPI_LAUNCH@
+#-n 8 @abs_top_builddir@/tests/test_mpi")) && check_reports();
+
+#
+# Local Variables:
+# mode: cperl
+# End:
+#
+

tests/test_sct_run.in

@@ -5,12 +5,18 @@ export SCT_CALLSTATS=0
 
 @OPENMP_TRUE@export OMP_NUM_THREADS=4
 
-@MPICHECK_TRUE@@MPI_TRUE@@MPI_LAUNCH@ -n 2 @abs_top_builddir@/tests/test_sct
-@MPICHECK_FALSE@@MPI_TRUE@@abs_top_builddir@/tests/test_sct
-@MPI_FALSE@@abs_top_builddir@/tests/test_sct
+@MPICHECK_TRUE@@MPI_TRUE@"@abs_top_builddir@/libtool" --mode=execute @MPI_LAUNCH@ -n 2 "@abs_top_builddir@/tests/test_sct"
+@MPICHECK_FALSE@@MPI_TRUE@"@abs_top_builddir@/tests/test_sct"
+@MPI_FALSE@"@abs_top_builddir@/tests/test_sct"
 
 retval=$?
 
 if (test $retval != 0) ; then
   exit 1
 fi
+
+#
+# Local Variables:
+# mode: sh
+# End:
+#