HDFFV-11001 need to qualify all by parallel or serial types

12 files changed, 196 insertions, 191 deletions

diff --git a/tools/test/h5copy/CMakeLists.txt b/tools/test/h5copy/CMakeLists.txt
index f84b667..028935f 100644
--- a/tools/test/h5copy/CMakeLists.txt
+++ b/tools/test/h5copy/CMakeLists.txt
@@ -43,6 +43,6 @@ if (BUILD_SHARED_LIBS)
   )
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 904e6ef..88ed62c 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -376,32 +376,34 @@
 ##############################################################################
 
   macro (ADD_H5_TEST resultfile resultcode)
-    # If using memchecker add tests without using scripts
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${ARGN})
-      set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (${resultcode})
-        set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
-      endif ()
-      if (last_test)
-        set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      add_test (
-          NAME H5DIFF-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_ext}>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.txt"
-              -D "TEST_APPEND=EXIT CODE:"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-      if (last_test)
-        set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+    if (HDF5_TEST_SERIAL)
+      # If using memchecker add tests without using scripts
+      if (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${ARGN})
+        set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+       if (${resultcode})
+          set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
+        endif ()
+        if (last_test)
+          set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+        endif ()
+      else ()
+        add_test (
+            NAME H5DIFF-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_ext}>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.txt"
+                -D "TEST_APPEND=EXIT CODE:"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+        if (last_test)
+          set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+        endif ()
       endif ()
     endif ()
     if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
@@ -1547,7 +1549,7 @@ ADD_H5_TEST (h5diff_v3 0 -c ${FILEV1} ${FILEV2})
 ##############################################################################
 ###    P L U G I N  T E S T S
 ##############################################################################
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS AND HDF5_TEST_SERIAL)
   ADD_H5_UD_TEST (h5diff_plugin_test 0 h5diff_ud -v tudfilter.h5 tudfilter2.h5)
   ADD_H5_UD_TEST (h5diff_plugin_fail 2 h5diff_udfail -v tudfilter.h5 tudfilter2.h5)
 endif ()
diff --git a/tools/test/h5dump/CMakeLists.txt b/tools/test/h5dump/CMakeLists.txt
index 82cada6..b9e4ef5 100644
--- a/tools/test/h5dump/CMakeLists.txt
+++ b/tools/test/h5dump/CMakeLists.txt
@@ -43,7 +43,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   #add_test (NAME h5dumpgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dumpgentest>)
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 
   include (CMakeTestsPBITS.cmake)
diff --git a/tools/test/h5format_convert/CMakeLists.txt b/tools/test/h5format_convert/CMakeLists.txt
index 33a38d4..9e49c4f 100644
--- a/tools/test/h5format_convert/CMakeLists.txt
+++ b/tools/test/h5format_convert/CMakeLists.txt
@@ -25,6 +25,6 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   #add_test (NAME h5fc_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_gentest>)
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/h5import/CMakeLists.txt b/tools/test/h5import/CMakeLists.txt
index 7a75f0d..a77ba00 100644
--- a/tools/test/h5import/CMakeLists.txt
+++ b/tools/test/h5import/CMakeLists.txt
@@ -15,6 +15,6 @@ else ()
 endif ()
 set_target_properties (h5importtest PROPERTIES FOLDER tools)
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/h5jam/CMakeLists.txt b/tools/test/h5jam/CMakeLists.txt
index 24836f0..f00e781 100644
--- a/tools/test/h5jam/CMakeLists.txt
+++ b/tools/test/h5jam/CMakeLists.txt
@@ -36,6 +36,6 @@ else ()
 endif ()
 set_target_properties (tellub PROPERTIES FOLDER tools)
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/h5ls/CMakeLists.txt b/tools/test/h5ls/CMakeLists.txt
index fefc995..abbe6d0 100644
--- a/tools/test/h5ls/CMakeLists.txt
+++ b/tools/test/h5ls/CMakeLists.txt
@@ -30,7 +30,7 @@ if (BUILD_SHARED_LIBS)
   )
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 
   include (CMakeTestsVDS.cmake)
diff --git a/tools/test/h5repack/CMakeLists.txt b/tools/test/h5repack/CMakeLists.txt
index a12b04a..5722354 100644
--- a/tools/test/h5repack/CMakeLists.txt
+++ b/tools/test/h5repack/CMakeLists.txt
@@ -98,6 +98,6 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   #add_test (NAME h5repackgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repackgentest>)
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/h5stat/CMakeLists.txt b/tools/test/h5stat/CMakeLists.txt
index a1afee5..0e2ee5e 100644
--- a/tools/test/h5stat/CMakeLists.txt
+++ b/tools/test/h5stat/CMakeLists.txt
@@ -14,6 +14,6 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   #add_test (NAME h5stat_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5stat_gentest>)
 endif ()
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/tools/test/misc/CMakeLists.txt b/tools/test/misc/CMakeLists.txt
index a250222..089a302 100644
--- a/tools/test/misc/CMakeLists.txt
+++ b/tools/test/misc/CMakeLists.txt
@@ -55,6 +55,8 @@ else ()
 endif ()
 set_target_properties (clear_open_chk PROPERTIES FOLDER tools)
 
-include (CMakeTestsRepart.cmake)
-include (CMakeTestsClear.cmake)
-include (CMakeTestsMkgrp.cmake)
+if (HDF5_TEST_SERIAL)
+  include (CMakeTestsRepart.cmake)
+  include (CMakeTestsClear.cmake)
+  include (CMakeTestsMkgrp.cmake)
+endif ()
diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index 6d26795..d788ffa 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -133,7 +133,7 @@ else ()
 endif ()
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
-if (H5_HAVE_PARALLEL AND BUILD_TESTING AND HDF5_TEST_PARALLEL)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
   if (UNIX)
       #-- Adding test for perf - only on unix systems
       set (perf_SOURCES
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index f0ae416..5d61f7b 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -22,175 +22,176 @@ add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf t
 #-----------------------------------------------------------------------------
 # Add Tests
 #-----------------------------------------------------------------------------
+if (HDF5_TEST_SERIAL)
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME PERFORM_h5perform-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove
+          chunk.h5
+          iopipe.h5
+          iopipe.raw
+          x-diag-rd.dat
+          x-diag-wr.dat
+          x-rowmaj-rd.dat
+          x-rowmaj-wr.dat
+          x-gnuplot
+          h5perf_serial.txt
+          h5perf_serial.txt.err
+          chunk.txt
+          chunk.txt.err
+          iopipe.txt
+          iopipe.txt.err
+          overhead.txt
+          overhead.txt.err
+          perf_meta.txt
+          perf_meta.txt.err
+          zip_perf-h.txt
+          zip_perf-h.txt.err
+          zip_perf.txt
+          zip_perf.txt.err
+  )
 
-# Remove any output file left over from previous test run
-add_test (
-    NAME PERFORM_h5perform-clearall-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        chunk.h5
-        iopipe.h5
-        iopipe.raw
-        x-diag-rd.dat
-        x-diag-wr.dat
-        x-rowmaj-rd.dat
-        x-rowmaj-wr.dat
-        x-gnuplot
-        h5perf_serial.txt
-        h5perf_serial.txt.err
-        chunk.txt
-        chunk.txt.err
-        iopipe.txt
-        iopipe.txt.err
-        overhead.txt
-        overhead.txt.err
-        perf_meta.txt
-        perf_meta.txt.err
-        zip_perf-h.txt
-        zip_perf-h.txt.err
-        zip_perf.txt
-        zip_perf.txt.err
-)
-
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
-else ()
-  add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=h5perf_serial.txt"
-      #-D "TEST_REFERENCE=h5perf_serial.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
+  else ()
+    add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=h5perf_serial.txt"
+        #-D "TEST_REFERENCE=h5perf_serial.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_h5perf_serial PROPERTIES
+      TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_h5perf_serial PROPERTIES
-    TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_BUILD_PERFORM_STANDALONE)
-  add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
-endif ()
+  if (HDF5_BUILD_PERFORM_STANDALONE)
+    add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
+  endif ()
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
-else ()
-  add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=chunk.txt"
-      #-D "TEST_REFERENCE=chunk.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
+  else ()
+    add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=chunk.txt"
+        #-D "TEST_REFERENCE=chunk.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_chunk PROPERTIES
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_chunk PROPERTIES
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
-else ()
-  add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=iopipe.txt"
-      #-D "TEST_REFERENCE=iopipe.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
+  else ()
+    add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=iopipe.txt"
+        #-D "TEST_REFERENCE=iopipe.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_iopipe PROPERTIES
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_iopipe PROPERTIES
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
-else ()
-  add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=overhead.txt"
-      #-D "TEST_REFERENCE=overhead.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
+  else ()
+    add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=overhead.txt"
+        #-D "TEST_REFERENCE=overhead.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_overhead PROPERTIES
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_overhead PROPERTIES
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
-else ()
-  add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=perf_meta.txt"
-      #-D "TEST_REFERENCE=perf_meta.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
+  else ()
+    add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=perf_meta.txt"
+        #-D "TEST_REFERENCE=perf_meta.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_perf_meta PROPERTIES
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_perf_meta PROPERTIES
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
-else ()
-  add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=zip_perf-h.txt"
-      #-D "TEST_REFERENCE=zip_perf-h.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
+  else ()
+    add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=zip_perf-h.txt"
+        #-D "TEST_REFERENCE=zip_perf-h.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_zip_perf_help PROPERTIES
+      DEPENDS "PERFORM_h5perform-clearall-objects"
   )
-endif ()
-set_tests_properties (PERFORM_zip_perf_help PROPERTIES
-    DEPENDS "PERFORM_h5perform-clearall-objects"
-)
 
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
-else ()
-  add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_SKIP_COMPARE=TRUE"
-      -D "TEST_OUTPUT=zip_perf.txt"
-      #-D "TEST_REFERENCE=zip_perf.out"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
+  else ()
+    add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=zip_perf.txt"
+        #-D "TEST_REFERENCE=zip_perf.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (PERFORM_zip_perf PROPERTIES
+      DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
   )
 endif ()
-set_tests_properties (PERFORM_zip_perf PROPERTIES
-    DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
-)
 
-if (H5_HAVE_PARALLEL)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
   if (UNIX)
     add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
   endif ()