HDFFV-10529 Update CMake tests to use test fixtures

3 files changed, 26 insertions, 161 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 6db0f6f..a05f906 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -42,25 +42,31 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5TEST-testlibinfo      #uses grepTest.cmake
     #########
     H5TEST-clear-objects
-    H5TEST-clear-cache-objects
-    H5TEST-clear-cache_api-objects
-    H5TEST-clear-cache_image-objects
-    H5TEST-clear-cache_tagging-objects
-    H5TEST-clear-del_many_dense_attrs-objects
-    H5TEST-clear-err_compat-objects
-    H5TEST-clear-error_test-objects
-    H5TEST-clear-filenotclosed-objects
-    H5TEST-clear-flush-objects
-    H5TEST-clear-links_env-objects
-    H5TEST-clear-testflushrefresh-objects
-    H5TEST-clear-testhdf5-objects
-    H5TEST-clear-ttsafe-objects
+    H5TEST-cache-clear-objects
+    H5TEST-cache_image-clear-objects
+    H5TEST-del_many_dense_attrs-clear-objects
+    H5TEST-external_env-clear-objects
+    H5TEST-filenotclosed-clear-objects
+    H5TEST-flush-clear-objects
+    H5TEST-links_env-clear-objects
+    H5TEST-testflushrefresh-clear-objects
+    H5TEST-testhdf5-clear-objects
+    H5TEST-vds_env-clear-objects
     PERFORM_h5perform-clear-objects
-    HL_TOOLS-clear-objects
     HL_test-clear-objects
     HL_FORTRAN_test-clear-objects
     FORTRAN_testhdf5-clear-objects
+    FORTRAN_flush1-clear-objects
     CPP_testhdf5-clear-objects
+    ######### examples #########
+    EXAMPLES-clear-objects
+    CPP_ex-clear-objects
+    CPP_ex_tutr-clear-objects
+    HL_ex-clear-objects
+    f90_ex-clear-objects
+    HL_CPP_ptableTest-clear-objects
+    HL_CPP_ex_ptExampleFL-clear-objects
+    HL_FORTRAN_f90_ex-clear-objects
     ######### tools/h5clear #########
     H5CLEAR-clearall-objects
     H5CLEAR-copy_h5clear_fsm_persist_equal.h5
@@ -89,10 +95,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ######### tools/h5diff #########
     H5DIFF-clearall-objects
     ######### tools/h5dump #########
-    H5DUMP-clearall-objects
-    H5DUMP_PACKED_BITS-clearall-objects
-    H5DUMP-XML-clearall-objects
-    H5DUMP_VDS-clearall-objects
     H5DUMP-t128bit_float      #uses grepTest.cmake
     ######### tools/h5format_convert #########
     H5FC-clearall-objects
@@ -100,136 +102,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5IMPORT-h5importtest-clear-objects
     H5IMPORT-clear-objects
     ######### tools/h5jam #########
-    H5JAM-SETUP-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u10_c
-    H5JAM-N_twithub_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u10_c
-    H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c
-    H5JAM-N_twithub_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u511_c
-    H5JAM-CHECKFILE-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c
-    H5JAM-N_twithub_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u512_c
-    H5JAM-CHECKFILE-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c
-    H5JAM-N_twithub_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u513_c
-    H5JAM-CHECKFILE-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c
-    H5JAM-N_twithub513_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u10_c
-    H5JAM-CHECKFILE-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c
-    H5JAM-N_twithub513_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u511_c
-    H5JAM-CHECKFILE-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c
-    H5JAM-N_twithub513_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u512_c
-    H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c
-    H5JAM-N_twithub513_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u513_c
-    H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u10_c-clear-objects
-    H5JAM-twithub_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u511_c-clear-objects
-    H5JAM-twithub_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u512_c-clear-objects
-    H5JAM-twithub_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u513_c-clear-objects
-    H5JAM-twithub513_u10_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10_c-clear-objects
-    H5JAM-twithub513_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511_c-clear-objects
-    H5JAM-twithub513_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512_c-clear-objects
-    H5JAM-twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513_c-clear-objects
-    H5JAM-SETUP-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub_tall
-    H5JAM-UNJAM-twithub_tall-clear-objects
-    H5JAM-UNJAM_D-twithub_tall-clear-objects
-    H5JAM-CHECKFILE-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall
-    H5JAM-UNJAM-twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall
-    H5JAM-UNJAM-N_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall
-    H5JAM-UNJAM-N_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall
-    H5JAM-UNJAM-D_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall
-    H5JAM-UNJAM-D_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-ta_u513-clear-objects
-    H5JAM-twithub_u10-clear-objects
-    H5JAM-CHECKFILE-twithub_u10-clear-objects
-    H5JAM-twithub_u511-clear-objects
-    H5JAM-CHECKFILE-twithub_u511-clear-objects
-    H5JAM-twithub_u512-clear-objects
-    H5JAM-CHECKFILE-twithub_u512-clear-objects
-    H5JAM-twithub_u513-clear-objects
-    H5JAM-CHECKFILE-twithub_u513-clear-objects
-    H5JAM-twithub513_u10-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10-clear-objects
-    H5JAM-twithub513_u511-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511-clear-objects
-    H5JAM-twithub513_u512-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512-clear-objects
-    H5JAM-twithub513_u513-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513-clear-objects
-    H5JAM-twithub_u10_c-clear-objects
-    H5JAM-tall_u10-clear-objects
-    H5JAM-CHECKFILE-tall_u10-clear-objects
-    H5JAM-tall_u511-clear-objects
-    H5JAM-CHECKFILE-tall_u511-clear-objects
-    H5JAM-tall_u512-clear-objects
-    H5JAM-CHECKFILE-tall_u512-clear-objects
-    H5JAM-tall_u513-clear-objects
-    H5JAM-CHECKFILE-tall_u513-clear-objects
-    H5JAM-SETUP-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u10
-    H5JAM-ta_u10-clear-objects
-    H5JAM-NONE_COPY-ta_u10
-    H5JAM-CHECKFILE-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u511
-    H5JAM-ta_u511-clear-objects
-    H5JAM-NONE_COPY-ta_u511
-    H5JAM-CHECKFILE-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u512
-    H5JAM-ta_u512-clear-objects
-    H5JAM-NONE_COPY-ta_u512
-    H5JAM-CHECKFILE-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u513-clear-objects
-    H5JAM-SETUP-ta_u513
-    H5JAM-ta_u513-clear-objects
-    H5JAM-NONE_COPY-ta_u513
     ######### tools/h5ls #########
     H5LS-clearall-objects
     H5LS_VDS-clearall-objects
@@ -286,7 +158,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5REPACK-HDFFV-7840-clear-objects
     H5REPACK_META-meta_long_N-clear-objects
     H5REPACK_META-meta_short_N-clear-objects
-    H5REPACK_OLD-old_style_layout_short_switches-clear-objects
     H5REPACK_STAT-GS_AGGR-clear-objects
     H5REPACK_STAT-S_AGGR-clear-objects
     H5REPACK_STAT-SP_NONE-clear-objects
@@ -331,14 +202,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5MKGRP-clearall-objects
     ######### tools/perform #########
     PERFORM_h5perform-clearall-objects
-    ######### hl/tools/h5watch #########
+    ######### hl/tools #########
+    HL_TOOLS-clear-objects
     H5WATCH-clearall-objects
-    ######### examples #########
-    EXAMPLES-clear-objects
-    CPP_ex-clear-objects
-    CPP_ex_tutr-clear-objects
-    HL_ex-clear-objects
-    f90_ex-clear-objects
-    HL_CPP_ex_ptExampleFL-clear-objects
-    HL_FORTRAN_f90_ex-clear-objects
 )
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index 279e077..2d3d371 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -14,7 +14,8 @@
 # This file provides functions for HDF5 specific Fortran support.
 #
 #-------------------------------------------------------------------------------
-ENABLE_LANGUAGE (Fortran)
+enable_language (Fortran)
+
 set (HDF_PREFIX "H5")
 include (CheckFortranFunctionExists)
 
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 972896d..e320c07 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -127,8 +127,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
       PROPERTIES
          OUTPUT_NAME
                ${LIB_RELEASE_NAME}
-         OUTPUT_NAME_DEBUG
-               ${LIB_DEBUG_NAME}
+#         OUTPUT_NAME_DEBUG
+#               ${LIB_DEBUG_NAME}
          OUTPUT_NAME_RELEASE
                ${LIB_RELEASE_NAME}
          OUTPUT_NAME_MINSIZEREL