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

34 files changed, 363 insertions, 356 deletions

diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index 67d84a7..89d62f1 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -68,6 +68,6 @@ foreach (example ${tutr_examples})
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index f6f5187..5e7134d 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -56,6 +56,6 @@ else ()
 endif ()
 set_target_properties (cpp_testhdf5 PROPERTIES FOLDER test/cpp)
 
-if (HDF5_TEST_CPP)
+if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 885e4f7..6440c81 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -201,7 +201,7 @@ endif ()
 if (TEST_REF_FILTER)
   #message (STATUS "TEST_REF_FILTER: ${TEST_APPEND}${TEST_REF_FILTER}")
   file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-  STRING(REGEX REPLACE "${TEST_REF_APPEND}" "${TEST_REF_FILTER}" TEST_STREAM "${TEST_STREAM}")
+  string (REGEX REPLACE "${TEST_REF_APPEND}" "${TEST_REF_FILTER}" TEST_STREAM "${TEST_STREAM}")
   file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
 endif ()
 
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index ea3b2c5..fd7f1dc 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -64,38 +64,40 @@ set (test_ex_CLEANFILES
     vds-eiger.h5
 )
 
-# Remove any output file left over from previous test run
-add_test (
-    NAME EXAMPLES-clear-objects
-    COMMAND    ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
-)
-set_tests_properties (EXAMPLES-clear-objects PROPERTIES FIXTURES_SETUP clear_EXAMPLES)
+if (HDF5_TEST_SERIAL)
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME EXAMPLES-clear-objects
+      COMMAND    ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
+  )
+  set_tests_properties (EXAMPLES-clear-objects PROPERTIES FIXTURES_SETUP clear_EXAMPLES)
 
-foreach (example ${examples})
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
-  else ()
-    add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
-        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-        -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
-        -D "TEST_ARGS:STRING="
-        -D "TEST_EXPECT=0"
-        -D "TEST_SKIP_COMPARE=TRUE"
-        -D "TEST_OUTPUT=${example}.txt"
-        #-D "TEST_REFERENCE=${example}.out"
-        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-    )
-  endif ()
-  set_tests_properties (EXAMPLES-${example} PROPERTIES FIXTURES_REQUIRED clear_EXAMPLES)
-  if (last_test)
-    set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "EXAMPLES-${example}")
-endforeach ()
+  foreach (example ${examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
+    else ()
+      add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=${example}.txt"
+          #-D "TEST_REFERENCE=${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (EXAMPLES-${example} PROPERTIES FIXTURES_REQUIRED clear_EXAMPLES)
+    if (last_test)
+      set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "EXAMPLES-${example}")
+  endforeach ()
+endif ()
 
 ### Windows pops up a modal permission dialog on this test
-if (H5_HAVE_PARALLEL AND NOT WIN32)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32)
   if (HDF5_ENABLE_USING_MEMCHECKER)
     add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
   else ()
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 9755963..31edad2 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -23,11 +23,8 @@ endif ()
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  if (HDF5_TEST_SERIAL)
-    add_subdirectory (test)
-  endif ()
-  if (MPI_Fortran_FOUND AND HDF5_TEST_PARALLEL)
-      add_subdirectory (testpar)
-    endif ()
+  add_subdirectory (test)
+  if (MPI_Fortran_FOUND)
+    add_subdirectory (testpar)
   endif ()
 endif ()
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index 5e7dfa8..a52375b 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -16,77 +16,79 @@
 ##############################################################################
 ##############################################################################
 
-set (test_ex_fortran_CLEANFILES
-    compound.h5
-    copy1.h5
-    copy2.h5
-    dsetf.h5
-    extend.h5
-    FORTRAN.h5
-    groupf.h5
-    groupsf.h5
-    h5_cmprss.h5
-    mount1.h5
-    mount2.h5
-    sdsf.h5
-    subset.h5
-    SDScompound.h5
-    test.h5
-)
+if (HDF5_TEST_SERIAL)
+  set (test_ex_fortran_CLEANFILES
+      compound.h5
+      copy1.h5
+      copy2.h5
+      dsetf.h5
+      extend.h5
+      FORTRAN.h5
+      groupf.h5
+      groupsf.h5
+      h5_cmprss.h5
+      mount1.h5
+      mount2.h5
+      sdsf.h5
+      subset.h5
+      SDScompound.h5
+      test.h5
+  )
 
-# Remove any output file left over from previous test run
-add_test (
-    NAME f90_ex-clear-objects
-    COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
-)
-set_tests_properties (f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_f90_ex)
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME f90_ex-clear-objects
+      COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
+  )
+  set_tests_properties (f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_f90_ex)
 
-foreach (example ${examples})
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f90_ex_${example}>)
-  else ()
-    add_test (NAME f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
-        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-        -D "TEST_PROGRAM=$<TARGET_FILE:f90_ex_${example}>"
-        -D "TEST_ARGS:STRING="
-        -D "TEST_EXPECT=0"
-        -D "TEST_SKIP_COMPARE=TRUE"
-        -D "TEST_OUTPUT=f90_ex_${example}.txt"
-        #-D "TEST_REFERENCE=f90_ex_${example}.out"
-        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-    )
-  endif ()
-  set_tests_properties (f90_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
-  if (last_test)
-    set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "f90_ex_${example}")
-endforeach ()
+  foreach (example ${examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f90_ex_${example}>)
+    else ()
+      add_test (NAME f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:f90_ex_${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=f90_ex_${example}.txt"
+          #-D "TEST_REFERENCE=f90_ex_${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (f90_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+    if (last_test)
+      set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "f90_ex_${example}")
+  endforeach ()
 
-foreach (example ${F2003_examples})
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME f03_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f03_ex_${example}>)
-  else ()
-    add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
-        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-        -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}>"
-        -D "TEST_ARGS:STRING="
-        -D "TEST_EXPECT=0"
-        -D "TEST_SKIP_COMPARE=TRUE"
-        -D "TEST_OUTPUT=f03_ex_${example}.txt"
-        #-D "TEST_REFERENCE=f03_ex_${example}.out"
-        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-    )
-  endif ()
-  set_tests_properties (f03_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
-  if (last_test)
-    set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "f03_ex_${example}")
-endforeach ()
+  foreach (example ${F2003_examples})
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME f03_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f03_ex_${example}>)
+    else ()
+      add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+          -D "TEST_PROGRAM=$<TARGET_FILE:f03_ex_${example}>"
+          -D "TEST_ARGS:STRING="
+          -D "TEST_EXPECT=0"
+          -D "TEST_SKIP_COMPARE=TRUE"
+          -D "TEST_OUTPUT=f03_ex_${example}.txt"
+          #-D "TEST_REFERENCE=f03_ex_${example}.out"
+          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+    endif ()
+    set_tests_properties (f03_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
+    if (last_test)
+      set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
+    endif ()
+    set (last_test "f03_ex_${example}")
+  endforeach ()
+endif ()
 
-if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
+if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND MPI_Fortran_FOUND)
   add_test (NAME MPI_TEST_f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
 endif ()
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 97d2ff7..3c46c9e 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -517,6 +517,6 @@ else ()
   add_dependencies (vol_connector ${HDF5_F90_TEST_LIBSH_TARGET})
 endif ()
 
-if (HDF5_TEST_FORTRAN)
+if (HDF5_TEST_FORTRAN AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index aa57b76..a62d9d4 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -17,7 +17,6 @@ endif ()
 # Add in the unit tests for the packet table c++ wrapper
 # --------------------------------------------------------------------
 
-if (BUILD_TESTING AND HDF5_TEST_SERIAL)
-    add_subdirectory (test)
-  endif ()
+if (BUILD_TESTING)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index a201dea..4bd4807 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -23,6 +23,6 @@ else ()
 endif ()
 set_target_properties (ptExampleFL PROPERTIES FOLDER examples/hl/cpp)
 
-if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 03237af..429e5c7 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -24,6 +24,6 @@ else ()
 endif ()
 set_target_properties (hl_ptableTest PROPERTIES FOLDER test/hl/cpp)
 
-if (HDF5_TEST_CPP)
+if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 0f4ad50..44115e5 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -39,6 +39,6 @@ foreach (example ${examples})
   set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index 9961f35..449194e 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -52,6 +52,6 @@ foreach (example ${examples})
   endif ()
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index 0c959bb..369692d 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -61,6 +61,6 @@ foreach (h5_test ${H5_TESTS})
   ADD_H5_FORTRAN_EXE(${h5_test})
 endforeach ()
 
-if (HDF5_TEST_FORTRAN)
+if (HDF5_TEST_FORTRAN AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index 0ea0af4..edb78c0 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -26,7 +26,7 @@ if (BUILD_SHARED_LIBS)
   set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5watch-shared)
 endif ()
 
-if (BUILD_TESTING AND HDF5_TEST_SWMR)
+if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   #-- Add swmr_check_compat_vfd program
   set (hl_swmr_check_compat_vfd_SOURCES
       ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/swmr_check_compat_vfd.c
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 5bb0f30..56e1695 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -49,7 +49,7 @@ endif ()
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
-if (BUILD_TESTING AND HDF5_TEST_JAVA)
+if (BUILD_TESTING)
   add_subdirectory (test)
 endif ()
 
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 5281d4e..02b9fdf 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -71,7 +71,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
 
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index f0d36b2..f32f645 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -56,7 +56,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
 
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 05ad995..e319a7f 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -55,7 +55,7 @@ foreach (h5_file ${HDF_JAVA_TEST_FILES})
 endforeach ()
 add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
 
-if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
 
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index d39396f..a1ccd6b 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -45,7 +45,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
 endforeach ()
 
-if (BUILD_TESTING AND HDF5_TEST_EXAMPLES)
+if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
 
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index dfb6e72..de7dc62 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -105,39 +105,41 @@ endif ()
 get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
 set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
 
-foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
-  set (CMAKE_JAVA_CLASSPATH ".")
-  foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
-    set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
+if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
+  foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
+    set (CMAKE_JAVA_CLASSPATH ".")
+    foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
+      set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
+    endforeach ()
+    set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_${test_file}_JAR_FILE}")
+
+    add_test (
+      NAME JUnit-${test_file}-clearall-objects
+      COMMAND ${CMAKE_COMMAND} -E remove
+          JUnit-${test_file}.out
+          JUnit-${test_file}.out.err
+    )
+    add_test (
+        NAME JUnit-${test_file}
+        COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
+            -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}"
+            -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore"
+            -D "TEST_PROGRAM=test.${test_file}"
+            -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
+            -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test"
+            -D "TEST_OUTPUT=JUnit-${test_file}.out"
+#            -D "TEST_LOG_LEVEL=trace"
+            -D "TEST_EXPECT=0"
+            -D "SKIP_APPEND=1"
+            -D "TEST_MASK_ERROR=TRUE"
+#            -D "TEST_FILTER:STRING=${testfilter}"
+            -D "TEST_REFERENCE=JUnit-${test_file}.txt"
+            -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
+    )
+    set_tests_properties (JUnit-${test_file} PROPERTIES
+        ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
+        DEPENDS "JUnit-${test_file}-clearall-objects"
+    )
   endforeach ()
-  set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_${test_file}_JAR_FILE}")
-
-  add_test (
-    NAME JUnit-${test_file}-clearall-objects
-    COMMAND ${CMAKE_COMMAND} -E remove
-        JUnit-${test_file}.out
-        JUnit-${test_file}.out.err
-  )
-  add_test (
-      NAME JUnit-${test_file}
-      COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-          -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}"
-          -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore"
-          -D "TEST_PROGRAM=test.${test_file}"
-          -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-          -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test"
-          -D "TEST_OUTPUT=JUnit-${test_file}.out"
-#          -D "TEST_LOG_LEVEL=trace"
-          -D "TEST_EXPECT=0"
-          -D "SKIP_APPEND=1"
-          -D "TEST_MASK_ERROR=TRUE"
-#          -D "TEST_FILTER:STRING=${testfilter}"
-          -D "TEST_REFERENCE=JUnit-${test_file}.txt"
-          -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
-  )
-  set_tests_properties (JUnit-${test_file} PROPERTIES
-      ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
-      DEPENDS "JUnit-${test_file}-clearall-objects"
-  )
-endforeach ()
+endif ()
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1184098..ec2a56b 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -51,14 +51,14 @@ New Features
     - Added new options to CMake for control of testing
 
       Added CMake options (default ON);
-          HDF5_TEST_SERIAL
-          HDF5_TEST_TOOLS
-          HDF5_TEST_EXAMPLES
-          HDF5_TEST_SWMR
-          HDF5_TEST_PARALLEL
-          HDF5_TEST_FORTRAN
-          HDF5_TEST_CPP
-          HDF5_TEST_JAVA
+          HDF5_TEST_SERIAL AND/OR HDF5_TEST_PARALLEL
+          combined with:
+            HDF5_TEST_TOOLS
+            HDF5_TEST_EXAMPLES
+            HDF5_TEST_SWMR
+            HDF5_TEST_FORTRAN
+            HDF5_TEST_CPP
+            HDF5_TEST_JAVA
 
       (ADB - 2020/01/15, HDFFV-11001)
 
diff --git a/tools/libtest/CMakeLists.txt b/tools/libtest/CMakeLists.txt
index 5c758d2..5f53272 100644
--- a/tools/libtest/CMakeLists.txt
+++ b/tools/libtest/CMakeLists.txt
@@ -15,6 +15,6 @@ else ()
 endif ()
 set_target_properties (h5tools_test_utils PROPERTIES FOLDER tools)
 
-if (HDF5_TEST_TOOLS)
+if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
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 ()