Fix CMake test macros and perform standalone tests

13 files changed, 397 insertions, 231 deletions

diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index 12ee40b..c07d005 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -64,7 +64,7 @@ if (NOT TEST_RESULT EQUAL TEST_EXPECT)
   if (NOT TEST_NOERRDISPLAY)
     if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out")
       file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out TEST_STREAM)
-    message (STATUS "Output USING ${TEST_VFD}:\n${TEST_STREAM}")
+      message (STATUS "Output USING ${TEST_VFD}:\n${TEST_STREAM}")
     endif ()
   endif ()
   message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index a6f1c7f..c65c951 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -82,93 +82,102 @@ if (TEST_FIND_RESULT GREATER 0)
 endif ()
 
 # if the TEST_ERRREF exists grep the error output with the error reference
+set (TEST_ERRREF_RESULT 0)
 if (TEST_ERRREF)
   # if the .err file exists grep the error output with the error reference before comparing stdout
   if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
     file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_ERR_STREAM)
-
-    # TEST_ERRREF should always be matched
-    string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
-    string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_RESULT)
-    if (NOT TEST_RESULT)
-      message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
+    list(LENGTH TEST_ERR_STREAM test_len)
+    if (test_len GREATER 0)
+      # TEST_ERRREF should always be matched
+      string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
+      string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_ERRREF_RESULT)
+      if (NOT TEST_ERRREF_RESULT)
+        message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
+      endif ()
     endif ()
   endif ()
 
   #always compare output file to reference unless this must be skipped
+  set (TEST_COMPARE_RESULT 0)
   if (NOT TEST_SKIP_COMPARE)
     if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
-      if (WIN32 OR MINGW)
-        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
-          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+      list(LENGTH TEST_STREAM test_len)
+      if (test_len GREATER 0)
+        if (WIN32 OR MINGW)
+          configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+          if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+            file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+          endif ()
+          #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+          #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
         endif ()
-        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-      endif ()
-      if (NOT TEST_SORT_COMPARE)
-        # now compare the output with the reference
-        execute_process (
-            COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-            RESULT_VARIABLE TEST_RESULT
-        )
-      else ()
-        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
-        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
-        list (SORT v1)
-        list (SORT v2)
-        if (NOT v1 STREQUAL v2)
-          set(TEST_RESULT 1)
+        if (NOT TEST_SORT_COMPARE)
+          # now compare the output with the reference
+          execute_process (
+              COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+              RESULT_VARIABLE TEST_COMPARE_RESULT
+          )
+        else ()
+          file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+          file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+          list (SORT v1)
+          list (SORT v2)
+          if (NOT v1 STREQUAL v2)
+            set(TEST_COMPARE_RESULT 1)
+          endif ()
         endif ()
-      endif ()
 
-      if (TEST_RESULT)
-        set (TEST_RESULT 0)
-        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
-        list (LENGTH test_act len_act)
-        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
-        list (LENGTH test_ref len_ref)
-        if (len_act GREATER 0 AND len_ref GREATER 0)
-          math (EXPR _FP_LEN "${len_ref} - 1")
-          foreach (line RANGE 0 ${_FP_LEN})
-            list (GET test_act ${line} str_act)
-            list (GET test_ref ${line} str_ref)
-            if (NOT str_act STREQUAL str_ref)
-              if (str_act)
-                set (TEST_RESULT 1)
-                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+        if (TEST_COMPARE_RESULT)
+          set (TEST_COMPARE_RESULT 0)
+          file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+          list (LENGTH test_act len_act)
+          file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+          list (LENGTH test_ref len_ref)
+          if (len_act GREATER 0 AND len_ref GREATER 0)
+            math (EXPR _FP_LEN "${len_ref} - 1")
+            foreach (line RANGE 0 ${_FP_LEN})
+              list (GET test_act ${line} str_act)
+              list (GET test_ref ${line} str_ref)
+              if (NOT str_act STREQUAL str_ref)
+                if (str_act)
+                  set (TEST_COMPARE_RESULT 1)
+                  message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+                endif ()
               endif ()
+            endforeach ()
+          else ()
+            if (len_act EQUAL 0)
+              message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+            endif ()
+            if (len_ref EQUAL 0)
+              message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
             endif ()
-          endforeach ()
-        else ()
-          if (len_act EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
           endif ()
-          if (len_ref EQUAL 0)
-            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+          if (NOT len_act EQUAL len_ref)
+            set (TEST_COMPARE_RESULT 1)
           endif ()
         endif ()
-        if (NOT len_act EQUAL len_ref)
-          set (TEST_RESULT 1)
-        endif ()
       endif ()
 
-      message (STATUS "COMPARE Result: ${TEST_RESULT}")
+      message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
 
       # again, if return value is !=0 scream and shout
-      if (TEST_RESULT)
+      if (TEST_COMPARE_RESULT)
         message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
       endif ()
     endif ()
   endif ()
 else ()
   # else grep the output with the reference
+  set (TEST_GREP_RESULT 0)
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
 
   # TEST_REFERENCE should always be matched
   string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
-  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT)
-  if (NOT TEST_RESULT)
+  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+  if (NOT TEST_GREP_RESULT)
     message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
   endif ()
 endif ()
@@ -178,8 +187,8 @@ if (TEST_FILTER)
   string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
   if (TEST_EXPECT)
     # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
-    string (LENGTH "${TEST_MATCH}" TEST_RESULT)
-    if (TEST_RESULT)
+    string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (TEST_GREP_RESULT)
       message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
     endif ()
   endif ()
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 0c4a5a0..885e4f7 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -90,18 +90,21 @@ message (STATUS "COMMAND Result: ${TEST_RESULT}")
 # if the .err file exists and ERRROR_APPEND is enabled
 if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  if (TEST_MASK_FILE)
-    STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
-  endif ()
-  # remove special output
-  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  list(LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    if (TEST_MASK_FILE)
+      STRING(REGEX REPLACE "CurrentDir is [^\n]+\n" "CurrentDir is (dir name)\n" TEST_STREAM "${TEST_STREAM}")
+    endif ()
+    # remove special output
+    string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
 
-  if (NOT ERROR_APPEND)
-    # write back to original .err file
-    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-  else ()
-    # append error output to the stdout output file
-    file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+    if (NOT ERROR_APPEND)
+      # write back to original .err file
+      file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+    else ()
+      # append error output to the stdout output file
+      file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+    endif ()
   endif ()
 endif ()
 
@@ -203,146 +206,159 @@ if (TEST_REF_FILTER)
 endif ()
 
 # compare output files to references unless this must be skipped
+set (TEST_COMPARE_RESULT 0)
 if (NOT TEST_SKIP_COMPARE)
   if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
-    if (WIN32 OR MINGW)
-      configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-      if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
-        file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    list(LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32 OR MINGW)
+        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        endif ()
+        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
       endif ()
-      #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-      #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-    endif ()
 
-    if (NOT TEST_SORT_COMPARE)
-      # now compare the output with the reference
-      execute_process (
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-          RESULT_VARIABLE TEST_RESULT
-      )
-    else ()
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
-      file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
-      list (SORT v1)
-      list (SORT v2)
-      if (NOT v1 STREQUAL v2)
-        set(TEST_RESULT 1)
+      if (NOT TEST_SORT_COMPARE)
+        # now compare the output with the reference
+        execute_process (
+            COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            RESULT_VARIABLE TEST_COMPARE_RESULT
+        )
+      else ()
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+        list (SORT v1)
+        list (SORT v2)
+        if (NOT v1 STREQUAL v2)
+          set(TEST_COMPARE_RESULT 1)
+        endif ()
       endif ()
-    endif ()
 
-    if (TEST_RESULT)
-      set (TEST_RESULT 0)
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
-      list (LENGTH test_act len_act)
-      file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
-      list (LENGTH test_ref len_ref)
-      if (len_act GREATER 0 AND len_ref GREATER 0)
-        math (EXPR _FP_LEN "${len_ref} - 1")
-        foreach (line RANGE 0 ${_FP_LEN})
-          list (GET test_act ${line} str_act)
-          list (GET test_ref ${line} str_ref)
-          if (NOT str_act STREQUAL str_ref)
-            if (str_act)
-              set (TEST_RESULT 1)
-              message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+      if (TEST_COMPARE_RESULT)
+        set (TEST_COMPARE_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+        list (LENGTH test_ref len_ref)
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_COMPARE_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
             endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
           endif ()
-        endforeach ()
-      else ()
-        if (len_act EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
         endif ()
-        if (len_ref EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
         endif ()
       endif ()
-      if (NOT len_act EQUAL len_ref)
-        set (TEST_RESULT 1)
-      endif ()
     endif ()
 
-    message (STATUS "COMPARE Result: ${TEST_RESULT}")
+    message (STATUS "COMPARE Result: ${TEST_COMPARE_RESULT}")
 
     # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
+    if (TEST_COMPARE_RESULT)
       message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
     endif ()
   endif ()
 
   # now compare the .err file with the error reference, if supplied
+  set (TEST_ERRREF_RESULT 0)
   if (TEST_ERRREF)
-    if (WIN32 OR MINGW)
-      configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-      if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
-        file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+    file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    list(LENGTH TEST_STREAM test_len)
+    if (test_len GREATER 0)
+      if (WIN32 OR MINGW)
+        configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+        if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+        endif ()
+        #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+        #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
       endif ()
-      #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-    endif ()
 
-    # now compare the error output with the error reference
-    execute_process (
-        COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
-        RESULT_VARIABLE TEST_RESULT
-    )
-    if (TEST_RESULT)
-      set (TEST_RESULT 0)
-      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
-      list (LENGTH test_act len_act)
-      file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
-      list (LENGTH test_ref len_ref)
-      math (EXPR _FP_LEN "${len_ref} - 1")
-      if (len_act GREATER 0 AND len_ref GREATER 0)
+      # now compare the error output with the error reference
+      execute_process (
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          RESULT_VARIABLE TEST_ERRREF_RESULT
+      )
+      if (TEST_ERRREF_RESULT)
+        set (TEST_ERRREF_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+        list (LENGTH test_ref len_ref)
         math (EXPR _FP_LEN "${len_ref} - 1")
-        foreach (line RANGE 0 ${_FP_LEN})
-          list (GET test_act ${line} str_act)
-          list (GET test_ref ${line} str_ref)
-          if (NOT str_act STREQUAL str_ref)
-            if (str_act)
-              set (TEST_RESULT 1)
-              message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_ERRREF_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
             endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
           endif ()
-        endforeach ()
-      else ()
-        if (len_act EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
         endif ()
-        if (len_ref EQUAL 0)
-          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_ERRREF_RESULT 1)
         endif ()
       endif ()
-      if (NOT len_act EQUAL len_ref)
-        set (TEST_RESULT 1)
-      endif ()
     endif ()
 
-    message (STATUS "COMPARE Result: ${TEST_RESULT}")
+    message (STATUS "COMPARE Result: ${TEST_ERRREF_RESULT}")
 
     # again, if return value is !=0 scream and shout
-    if (TEST_RESULT)
+    if (TEST_ERRREF_RESULT)
       message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
     endif ()
   endif ()
 endif ()
 
+set (TEST_GREP_RESULT 0)
 if (TEST_GREP_COMPARE)
   # now grep the output with the reference
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  list(LENGTH TEST_STREAM test_len)
+  if (test_len GREATER 0)
+    # TEST_REFERENCE should always be matched
+    string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+    string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+    if (NOT TEST_GREP_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+    endif ()
 
-  # TEST_REFERENCE should always be matched
-  string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
-  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT)
-  if (NOT TEST_RESULT)
-    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
-  endif ()
-
-  string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
-  if (TEST_EXPECT)
-    # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
-    string (LENGTH "${TEST_MATCH}" TEST_RESULT)
-    if (TEST_RESULT)
-      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+    string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+    if (TEST_EXPECT)
+      # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+      string (LENGTH "${TEST_MATCH}" TEST_GREP_RESULT)
+      if (TEST_GREP_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+      endif ()
     endif ()
   endif ()
 endif ()
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index 4ad2423..cb89019 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -123,14 +123,14 @@ get_timer_type(io_time_t *pt)
 #endif
 
 /*
- * Function:    set_time
+ * Function:    io_time_set
  * Purpose:     Set the time in a ``io_time_t'' object.
  * Return:      Pointer to the passed in ``io_time_t'' object if SUCCEED; Null otherwise.
  * Programmer:  Bill Wendling, 01. October 2001
  * Modifications:
  */
 io_time_t *
-set_time(io_time_t *pt, timer_type t, int start_stop)
+io_time_set(io_time_t *pt, timer_type t, int start_stop)
 {
     /* sanity check */
     HDassert(pt);
@@ -160,6 +160,10 @@ set_time(io_time_t *pt, timer_type t, int start_stop)
 		pt->total_time[HDF5_FILE_READ_CLOSE] += pt->mpi_timer[t] - pt->mpi_timer[HDF5_FINE_READ_FIXED_DIMS];
 	}
 	break;
+#else
+    case MPI_CLOCK:
+	    HDfprintf(stderr, "MPI clock set in serial library\n");
+	    return NULL;
 #endif /* H5_HAVE_PARALLEL */
     case SYS_CLOCK:
             if (start_stop == TSTART) {
@@ -203,15 +207,18 @@ set_time(io_time_t *pt, timer_type t, int start_stop)
 }
 
 /*
- * Function:    get_time
+ * Function:    io_time_get
  * Purpose:     Get the time from a ``io_time_t'' object.
  * Return:      The number of seconds as a DOUBLE.
  * Programmer:  Bill Wendling, 01. October 2001
  * Modifications:
  */
-double
-get_time(io_time_t *pt, timer_type t)
+H5_ATTR_PURE double
+io_time_get(io_time_t *pt, timer_type t)
 {
+    /* sanity check */
+    HDassert(pt);
+
     return pt->total_time[t];
 }
 
diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h
index 48b6c87..78bf676 100644
--- a/tools/lib/io_timer.h
+++ b/tools/lib/io_timer.h
@@ -72,8 +72,8 @@ extern "C" {
 #endif  /* __cplusplus */
 H5TOOLS_DLL io_time_t   *io_time_new(clock_type t);
 H5TOOLS_DLL void         io_time_destroy(io_time_t *pt);
-H5TOOLS_DLL io_time_t   *set_time(io_time_t *pt, timer_type t, int start_stop);
-H5TOOLS_DLL double       get_time(io_time_t *pt, timer_type t);
+H5TOOLS_DLL io_time_t   *io_time_set(io_time_t *pt, timer_type t, int start_stop);
+H5TOOLS_DLL double       io_time_get(io_time_t *pt, timer_type t);
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */
diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index ff61f52..5f409e1 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -21,7 +21,7 @@ endif ()
 set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
 
 if (HDF5_BUILD_PERFORM_STANDALONE AND BUILD_TESTING)
-  #-- Adding test for h5perf_serial_alone
+  #-- Adding test for h5perf_serial_alone - io_timer.c includes
   set (h5perf_serial_alone_SOURCES
       ${HDF5_TOOLS_SRC_DIR}/lib/io_timer.c
       ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/sio_perf.c
@@ -32,10 +32,10 @@ if (HDF5_BUILD_PERFORM_STANDALONE AND BUILD_TESTING)
   target_include_directories (h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TOOLS_SRC_DIR}/lib;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT BUILD_SHARED_LIBS)
     TARGET_C_PROPERTIES (h5perf_serial_alone STATIC)
-    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET})
+    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
   else ()
     TARGET_C_PROPERTIES (h5perf_serial_alone SHARED)
-    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIBSH_TARGET})
+    target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
   endif ()
   set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
   set_property (TARGET h5perf_serial_alone
diff --git a/tools/perform/pio_engine.c b/tools/perform/pio_engine.c
index b5d91aa..5d8474b 100644
--- a/tools/perform/pio_engine.c
+++ b/tools/perform/pio_engine.c
@@ -311,21 +311,21 @@ do_pio(parameters param)
     /* Need barrier to make sure everyone starts at the same time */
     MPI_Barrier(pio_comm_g);
 
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
     hrc = do_fopen(&param, fname, &fd, PIO_CREATE | PIO_WRITE);
 
     VRFY((hrc == SUCCESS), "do_fopen failed");
 
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
     hrc = do_write(&res, &fd, &param, ndsets, nbytes, buf_size, buffer);
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
 
     VRFY((hrc == SUCCESS), "do_write failed");
 
     /* Close file for write */
     hrc = do_fclose(iot, &fd);
 
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
     VRFY((hrc == SUCCESS), "do_fclose failed");
 
     if (!param.h5_write_only) {
@@ -339,20 +339,20 @@ do_pio(parameters param)
         MPI_Barrier(pio_comm_g);
 
         /* Open file for read */
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
+        io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
         hrc = do_fopen(&param, fname, &fd, PIO_READ);
 
         VRFY((hrc == SUCCESS), "do_fopen failed");
 
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
+        io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
         hrc = do_read(&res, &fd, &param, ndsets, nbytes, buf_size, buffer);
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
+        io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
         VRFY((hrc == SUCCESS), "do_read failed");
 
         /* Close file for read */
         hrc = do_fclose(iot, &fd);
 
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
+        io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
         VRFY((hrc == SUCCESS), "do_fclose failed");
     }
 
@@ -958,7 +958,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
     } /* end else */
 
     /* Start "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
 
     while (nbytes_xfer < bytes_count){
         /* Write */
@@ -1389,7 +1389,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
     } /* end while */
 
     /* Stop "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
 
     /* Calculate write time */
 
@@ -1889,7 +1889,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
     } /* end else */
 
     /* Start "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
+    io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
 
     while (nbytes_xfer < bytes_count){
         /* Read */
@@ -2344,7 +2344,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
     } /* end while */
 
     /* Stop "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
+    io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
 
     /* Calculate read time */
 
@@ -2639,9 +2639,9 @@ int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
     int count, MPI_Datatype datatype, MPI_Status *status)
 {
     int err;
-    set_time(timer_g, HDF5_MPI_READ, TSTART);
+    io_time_set(timer_g, HDF5_MPI_READ, TSTART);
     err=PMPI_File_read_at(fh, offset, buf, count, datatype, status);
-    set_time(timer_g, HDF5_MPI_READ, TSTOP);
+    io_time_set(timer_g, HDF5_MPI_READ, TSTOP);
     return err;
 }
 
@@ -2650,9 +2650,9 @@ int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
     int count, MPI_Datatype datatype, MPI_Status *status)
 {
     int err;
-    set_time(timer_g, HDF5_MPI_READ, TSTART);
+    io_time_set(timer_g, HDF5_MPI_READ, TSTART);
     err=PMPI_File_read_at_all(fh, offset, buf, count, datatype, status);
-    set_time(timer_g, HDF5_MPI_READ, TSTOP);
+    io_time_set(timer_g, HDF5_MPI_READ, TSTOP);
     return err;
 }
 
@@ -2660,9 +2660,9 @@ int MPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
     int count, MPI_Datatype datatype, MPI_Status *status)
 {
     int err;
-    set_time(timer_g, HDF5_MPI_WRITE, TSTART);
+    io_time_set(timer_g, HDF5_MPI_WRITE, TSTART);
     err=PMPI_File_write_at(fh, offset, buf, count, datatype, status);
-    set_time(timer_g, HDF5_MPI_WRITE, TSTOP);
+    io_time_set(timer_g, HDF5_MPI_WRITE, TSTOP);
     return err;
 }
 
@@ -2670,9 +2670,9 @@ int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
     int count, MPI_Datatype datatype, MPI_Status *status)
 {
     int err;
-    set_time(timer_g, HDF5_MPI_WRITE, TSTART);
+    io_time_set(timer_g, HDF5_MPI_WRITE, TSTART);
     err=PMPI_File_write_at_all(fh, offset, buf, count, datatype, status);
-    set_time(timer_g, HDF5_MPI_WRITE, TSTOP);
+    io_time_set(timer_g, HDF5_MPI_WRITE, TSTOP);
     return err;
 }
 
diff --git a/tools/perform/pio_perf.c b/tools/perform/pio_perf.c
index 361e824..5977731 100644
--- a/tools/perform/pio_perf.c
+++ b/tools/perform/pio_perf.c
@@ -587,74 +587,74 @@ run_test(iotype iot, parameters parms, struct options *opts)
         res = do_pio(parms);
 
         /* gather all of the "mpi write" times */
-        t = get_time(res.timers, HDF5_MPI_WRITE);
+        t = io_time_get(res.timers, HDF5_MPI_WRITE);
         get_minmax(&write_mpi_mm, t);
 
         write_mpi_mm_table[i] = write_mpi_mm;
 
         /* gather all of the "write" times */
-        t = get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
         get_minmax(&write_mm, t);
 
         write_mm_table[i] = write_mm;
 
         /* gather all of the "write" times from open to close */
-        t = get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
         get_minmax(&write_gross_mm, t);
 
         write_gross_mm_table[i] = write_gross_mm;
 
         /* gather all of the raw "write" times */
-        t = get_time(res.timers, HDF5_RAW_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_RAW_WRITE_FIXED_DIMS);
         get_minmax(&write_raw_mm, t);
 
         write_raw_mm_table[i] = write_raw_mm;
 
         /* gather all of the file open times (time from open to first write) */
-        t = get_time(res.timers, HDF5_FILE_WRITE_OPEN);
+        t = io_time_get(res.timers, HDF5_FILE_WRITE_OPEN);
         get_minmax(&write_open_mm, t);
 
         write_open_mm_table[i] = write_open_mm;
 
         /* gather all of the file close times (time from last write to close) */
-        t = get_time(res.timers, HDF5_FILE_WRITE_CLOSE);
+        t = io_time_get(res.timers, HDF5_FILE_WRITE_CLOSE);
         get_minmax(&write_close_mm, t);
 
         write_close_mm_table[i] = write_close_mm;
 
         if (!parms.h5_write_only) {
             /* gather all of the "mpi read" times */
-            t = get_time(res.timers, HDF5_MPI_READ);
+            t = io_time_get(res.timers, HDF5_MPI_READ);
             get_minmax(&read_mpi_mm, t);
 
             read_mpi_mm_table[i] = read_mpi_mm;
 
             /* gather all of the "read" times */
-            t = get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_FINE_READ_FIXED_DIMS);
             get_minmax(&read_mm, t);
 
             read_mm_table[i] = read_mm;
 
             /* gather all of the "read" times from open to close */
-            t = get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
             get_minmax(&read_gross_mm, t);
 
             read_gross_mm_table[i] = read_gross_mm;
 
             /* gather all of the raw "read" times */
-            t = get_time(res.timers, HDF5_RAW_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_RAW_READ_FIXED_DIMS);
             get_minmax(&read_raw_mm, t);
 
             read_raw_mm_table[i] = read_raw_mm;
 
             /* gather all of the file open times (time from open to first read) */
-            t = get_time(res.timers, HDF5_FILE_READ_OPEN);
+            t = io_time_get(res.timers, HDF5_FILE_READ_OPEN);
             get_minmax(&read_open_mm, t);
 
             read_open_mm_table[i] = read_open_mm;
 
             /* gather all of the file close times (time from last read to close) */
-            t = get_time(res.timers, HDF5_FILE_READ_CLOSE);
+            t = io_time_get(res.timers, HDF5_FILE_READ_CLOSE);
             get_minmax(&read_close_mm, t);
 
             read_close_mm_table[i] = read_close_mm;
diff --git a/tools/perform/pio_perf.h b/tools/perform/pio_perf.h
index 7605f20..55d721e 100644
--- a/tools/perform/pio_perf.h
+++ b/tools/perform/pio_perf.h
@@ -13,12 +13,13 @@
 #ifndef PIO_PERF_H__
 #define PIO_PERF_H__
 
-#include "io_timer.h"
 #ifndef STANDALONE
+#include "io_timer.h"
 #include "h5test.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #else
+#include "io_timer.h"
 #include "pio_standalone.h"
 #endif
 
diff --git a/tools/perform/pio_standalone.c b/tools/perform/pio_standalone.c
index 0fba904..8cdca85 100644
--- a/tools/perform/pio_standalone.c
+++ b/tools/perform/pio_standalone.c
@@ -164,3 +164,135 @@ print_version(const char *progname)
            progname, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
            H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE);
 }
+
+#ifdef STANDALONE
+/*
+ * Function:    h5_set_info_object
+ * Purpose:     Process environment variables setting to set up MPI Info
+ *              object.
+ * Return:      0 if all is fine; otherwise non-zero.
+ * Programmer:  Albert Cheng, 2002/05/21.
+ * Modifications:
+ *          Bill Wendling, 2002/05/31
+ *          Modified so that the HDF5_MPI_INFO environment variable can
+ *          be a semicolon separated list of "key=value" pairings. Most
+ *          of the code is to remove any whitespaces which might be
+ *          surrounding the "key=value" pairs.
+ */
+int
+h5_set_info_object(void)
+{
+    char  *envp;      /* environment pointer */
+    int    ret_value=0;
+
+    /* handle any MPI INFO hints via $HDF5_MPI_INFO */
+    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL){
+        char *next, *valp;
+
+        valp = envp = next = HDstrdup(envp);
+
+        if (!valp) return 0;
+
+        /* create an INFO object if not created yet */
+        if (h5_io_info_g == MPI_INFO_NULL)
+            MPI_Info_create(&h5_io_info_g);
+
+        do {
+            size_t len;
+            char *key_val, *endp, *namep;
+
+            if (*valp == ';')
+                valp++;
+
+            /* copy key/value pair into temporary buffer */
+            len = strcspn(valp, ";");
+            next = &valp[len];
+            key_val = (char *)HDcalloc(1, len + 1);
+
+            /* increment the next pointer past the terminating semicolon */
+            if (*next == ';')
+                ++next;
+
+            namep = HDstrncpy(key_val, valp, len);
+
+            /* pass up any beginning whitespaces */
+            while (*namep && (*namep == ' ' || *namep == '\t'))
+                namep++;
+
+            if (!*namep) continue; /* was all white space, so move to next k/v pair */
+
+            /* eat up any ending white spaces */
+            endp = &namep[HDstrlen(namep) - 1];
+
+            while (endp && (*endp == ' ' || *endp == '\t'))
+                *endp-- = '\0';
+
+            /* find the '=' */
+            valp = HDstrchr(namep, '=');
+
+            if (valp != NULL) {     /* it's a valid key/value pairing */
+                char *tmp_val = valp + 1;
+
+                /* change '=' to \0, move valp down one */
+                *valp-- = '\0';
+
+                /* eat up ending whitespace on the "key" part */
+                while (*valp == ' ' || *valp == '\t')
+                    *valp-- = '\0';
+
+                valp = tmp_val;
+
+                /* eat up beginning whitespace on the "value" part */
+                while (*valp == ' ' || *valp == '\t')
+                    *valp++ = '\0';
+
+                /* actually set the darned thing */
+                if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
+                    HDprintf("MPI_Info_set failed\n");
+                    ret_value = -1;
+                }
+            }
+
+            valp = next;
+            HDfree(key_val);
+        } while (next && *next);
+
+        HDfree(envp);
+    }
+
+    return ret_value;
+}
+
+
+/*
+ * Function:    h5_dump_info_object
+ * Purpose:     Display content of an MPI Info object
+ * Return:      void
+ * Programmer:  Albert Cheng 2002/05/21
+ * Modifications:
+ */
+void
+h5_dump_info_object(MPI_Info info)
+{
+    char  key[MPI_MAX_INFO_KEY+1];
+    char  value[MPI_MAX_INFO_VAL+1];
+    int    flag;
+    int    i, nkeys;
+
+    HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
+    if (info==MPI_INFO_NULL){
+  HDprintf("object is MPI_INFO_NULL\n");
+    }
+    else {
+  MPI_Info_get_nkeys(info, &nkeys);
+  HDprintf("object has %d items\n", nkeys);
+  for (i=0; i<nkeys; i++){
+      MPI_Info_get_nthkey(info, i, key);
+      MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
+      HDprintf("%s=%s\n", key, value);
+  }
+
+    }
+}
+#endif  /* STANDALONE */
+
diff --git a/tools/perform/sio_engine.c b/tools/perform/sio_engine.c
index 70460f6..9e93816 100644
--- a/tools/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
@@ -213,18 +213,18 @@ do_sio(parameters param)
         HDfprintf(output, "data filename=%s\n",
              fname);
 
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
     hrc = do_fopen(&param, fname, &fd, SIO_CREATE | SIO_WRITE);
     VRFY((hrc == SUCCESS), "do_fopen failed");
 
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
     hrc = do_write(&res, &fd, &param, buffer);
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
     VRFY((hrc == SUCCESS), "do_write failed");
 
     /* Close file for write */
     hrc = do_fclose(iot, &fd);
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
     VRFY((hrc == SUCCESS), "do_fclose failed");
 
     if (!param.h5_write_only) {
@@ -233,19 +233,19 @@ do_sio(parameters param)
          */
 
         /* Open file for read */
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
+        io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
         hrc = do_fopen(&param, fname, &fd, SIO_READ);
         VRFY((hrc == SUCCESS), "do_fopen failed");
 
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
+        io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
         hrc = do_read(&res, &fd, &param, buffer);
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
+        io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
         VRFY((hrc == SUCCESS), "do_read failed");
 
         /* Close file for read */
         hrc = do_fclose(iot, &fd);
 
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
+        io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
         VRFY((hrc == SUCCESS), "do_fclose failed");
     }
 
@@ -552,7 +552,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
     }
 
     /* Start "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
+    io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
 
     /* Perform write */
     hrc = dset_write(rank-1, fd, parms, buffer);
@@ -564,7 +564,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
 
 
     /* Stop "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
+    io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
 
     /* Calculate write time */
 
@@ -874,7 +874,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
     } /* end switch */
 
     /* Start "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
+    io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
     hrc = dset_read(rank-1, fd, parms, buffer, buffer2);
 
     if (hrc < 0) {
@@ -883,7 +883,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
     }
 
     /* Stop "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
+    io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
 
     /* Calculate read time */
 
diff --git a/tools/perform/sio_perf.c b/tools/perform/sio_perf.c
index 0806d3a..047c64b 100644
--- a/tools/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
@@ -499,50 +499,50 @@ run_test(iotype iot, parameters parms, struct options *opts)
         res = do_sio(parms);
 
         /* gather all of the "sys write" times */
-        t = get_time(res.timers, HDF5_MPI_WRITE);
+        t = io_time_get(res.timers, HDF5_MPI_WRITE);
         get_minmax(&write_sys_mm, t);
 
         write_sys_mm_table[i] = write_sys_mm;
 
         /* gather all of the "write" times */
-        t = get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
         get_minmax(&write_mm, t);
 
         write_mm_table[i] = write_mm;
 
         /* gather all of the "write" times from open to close */
-        t = get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
         get_minmax(&write_gross_mm, t);
 
         write_gross_mm_table[i] = write_gross_mm;
 
         /* gather all of the raw "write" times */
-        t = get_time(res.timers, HDF5_RAW_WRITE_FIXED_DIMS);
+        t = io_time_get(res.timers, HDF5_RAW_WRITE_FIXED_DIMS);
         get_minmax(&write_raw_mm, t);
 
         write_raw_mm_table[i] = write_raw_mm;
 
         if (!parms.h5_write_only) {
             /* gather all of the "mpi read" times */
-            t = get_time(res.timers, HDF5_MPI_READ);
+            t = io_time_get(res.timers, HDF5_MPI_READ);
             get_minmax(&read_sys_mm, t);
 
             read_sys_mm_table[i] = read_sys_mm;
 
             /* gather all of the "read" times */
-            t = get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_FINE_READ_FIXED_DIMS);
             get_minmax(&read_mm, t);
 
             read_mm_table[i] = read_mm;
 
             /* gather all of the "read" times from open to close */
-            t = get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
             get_minmax(&read_gross_mm, t);
 
             read_gross_mm_table[i] = read_gross_mm;
 
             /* gather all of the raw "read" times */
-            t = get_time(res.timers, HDF5_RAW_READ_FIXED_DIMS);
+            t = io_time_get(res.timers, HDF5_RAW_READ_FIXED_DIMS);
             get_minmax(&read_raw_mm, t);
 
             read_raw_mm_table[i] = read_gross_mm;
diff --git a/tools/perform/sio_perf.h b/tools/perform/sio_perf.h
index fc94089..b894b3a 100644
--- a/tools/perform/sio_perf.h
+++ b/tools/perform/sio_perf.h
@@ -13,12 +13,13 @@
 #ifndef SIO_PERF_H__
 #define SIO_PERF_H__
 
-#include "io_timer.h"
 #ifndef STANDALONE
+#include "io_timer.h"
 #include "h5test.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #else
+#include "io_timer.h"
 #include "sio_standalone.h"
 #endif