From a8437787596fb8f6ff61427e76122bc4c996009c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 31 Dec 2018 13:00:39 -0600
Subject: HDFFV-10669 merge from develop

---
 config/cmake_ext_mod/runTest.cmake | 11 +++++++----
 java/src/jni/h5fImp.c              |  2 +-
 tools/test/h5jam/tellub.c          |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 8181ff0..026131b 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -97,10 +97,10 @@ if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
   string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
 
   if (NOT ERROR_APPEND)
-    # append error output to the stdout output file
+    # write back to original .err file
     file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
   else ()
-    # write back to original .err file
+    # append error output to the stdout output file
     file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
   endif ()
 endif ()
@@ -125,8 +125,11 @@ message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
 # remove special output
 file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
-file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
+if ("${TEST_FIND_RESULT}" GREATER "0")
+  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
+endif ()
 
 # if the output file needs Storage text removed
 if (TEST_MASK)
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 9d68290..20c22c3 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -177,7 +177,7 @@ Java_hdf_hdf5lib_H5__1H5Fget_1create_1plist
 {
     hid_t retVal = -1;
 
-    retVal =  H5Fget_create_plist((hid_t)file_id );
+    retVal =  H5Fget_create_plist((hid_t)file_id);
     if (retVal < 0)
         h5libraryError(env);
 
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 1c6ed3c..ea362f5 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -53,7 +53,7 @@ usage (const char *prog)
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
- * Purpose:     Parse the command line for the h5dumper.
+ * Purpose:     Parse the command line.
  *
  * Return:      Success:    void
  *              Failure:    Exits program with EXIT_FAILURE value.
@@ -89,7 +89,7 @@ parse_command_line (int argc, const char *argv[])
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:     HDF5 user block unjammer
+ * Purpose:     HDF5 user block tell size
  *
  * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *-------------------------------------------------------------------------
-- 
cgit v0.12