From a89048a746c3bc06e2eb21761d37ab0d508a4a11 Mon Sep 17 00:00:00 2001
From: Matthias Diener <mdiener@illinois.edu>
Date: Thu, 19 Jul 2018 17:06:31 -0500
Subject: [PATCH] ROMIO: reenable PMPI tests

Change-Id: I7d2481d38816d4bea3c0422ded191b613722c730
---
 src/libs/ck-libs/ampi/romio/test/Makefile.in |  6 ++--
 src/libs/ck-libs/ampi/romio/test/runtests.in | 42 +++++++++++++---------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/libs/ck-libs/ampi/romio/test/Makefile.in b/src/libs/ck-libs/ampi/romio/test/Makefile.in
index 784f15e9a4..e74b798846 100644
--- a/src/libs/ck-libs/ampi/romio/test/Makefile.in
+++ b/src/libs/ck-libs/ampi/romio/test/Makefile.in
@@ -8,10 +8,8 @@ USER_CFLAGS = @USER_CFLAGS@ $(INCLUDE_DIR)
 USER_FFLAGS = @USER_FFLAGS@ $(INCLUDE_DIR)
 CTESTS = simple perf async coll_test coll_perf misc file_info excl large_array \
      atomicity noncontig i_noncontig noncontig_coll split_coll shared_fp \
-     large_file error status noncontig_coll2
-# disabled test: psimple (no PMPI support in AMPI yet)
-FTESTS = fcoll_test fperf fmisc
-# disabled FTEST: pfcoll_test (no PMPI support in AMPI yet)
+     large_file error status noncontig_coll2 psimple
+FTESTS = fcoll_test fperf fmisc pfcoll_test
 srcdir=@srcdir@
 
 @VPATH@
diff --git a/src/libs/ck-libs/ampi/romio/test/runtests.in b/src/libs/ck-libs/ampi/romio/test/runtests.in
index b31f7721d6..d93a9017fa 100644
--- a/src/libs/ck-libs/ampi/romio/test/runtests.in
+++ b/src/libs/ck-libs/ampi/romio/test/runtests.in
@@ -1,6 +1,6 @@
 #! /bin/sh
-mpirun="./charmrun ++local ++quiet "
-PARALLEL="+p" # How to specify the number of ranks (-np in a normal mpirun command)
+mpirun="./ampirun "
+PARALLEL="-np" # How to specify the number of ranks (-np in a normal mpirun command)
 STOPFILE=$HOME/.stopmpichtests
 #
 # If the programs are not available, run make.
@@ -285,17 +285,16 @@ CheckOutput split_coll
 CleanExe split_coll
 #
 OutTime
-# psimple is not supported in AMPI 6.8.0 (no PMPI support)
-# testfiles="$testfiles psimple.out"
-# \rm -f psimple.out
-# MakeExe psimple
-# \rm -f $FILENAME*
-# echo '**** Testing psimple.c ****'
-# $mpirun $PARALLEL 4 ./psimple -fname $FILENAME "$@" >> psimple.out 2>&1
-# CheckOutput psimple
-# CleanExe psimple
-# #
-# OutTime
+testfiles="$testfiles psimple.out"
+\rm -f psimple.out
+MakeExe psimple
+\rm -f $FILENAME*
+echo '**** Testing psimple.c ****'
+$mpirun $PARALLEL 4 ./psimple -fname $FILENAME "$@" >> psimple.out 2>&1
+CheckOutput psimple
+CleanExe psimple
+#
+OutTime
 testfiles="$testfiles error.out"
 \rm -f error.out
 MakeExe error
@@ -340,15 +339,14 @@ if [ @NOF77@ = 0 ] ; then
     CleanExe fcoll_test
 #
     OutTime
-    # pfcoll_test is not supported in AMPI 6.8.0 (no PMPI support)
-    # testfiles="$testfiles pfcoll_test.out"
-    # \rm -f pfcoll_test.out
-    # MakeExe pfcoll_test
-    # \rm -f $FILENAME*
-    # echo '**** Testing pfcoll_test.f ****'
-    # $mpirun $PARALLEL 4 ./pfcoll_test -fname $FILENAME "$@" >> pfcoll_test.out 2>&1
-    # CheckOutput pfcoll_test
-    # CleanExe pfcoll_test
+    testfiles="$testfiles pfcoll_test.out"
+    \rm -f pfcoll_test.out
+    MakeExe pfcoll_test
+    \rm -f $FILENAME*
+    echo '**** Testing pfcoll_test.f ****'
+    $mpirun $PARALLEL 4 ./pfcoll_test -fname $FILENAME "$@" >> pfcoll_test.out 2>&1
+    CheckOutput pfcoll_test
+    CleanExe pfcoll_test
 #
 echo ""
 fi
-- 
2.11.4.GIT