[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.

Also warning session fixes.

Tested: CMake local linux

3 files changed, 70 insertions, 66 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2650722..efa78e1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -65,7 +65,7 @@ IF (BUILD_SHARED_LIBS)
     INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
 
     ADD_LIBRARY (${HDF5_TEST_PLUGIN_LIB_TARGET} ${LIB_TYPE} ${HDF5_TEST_SOURCE_DIR}/${test_lib}.c)
-   TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_LIB_TARGET} " " " ")
+    TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_LIB_TARGET} " " " ")
     TARGET_LINK_LIBRARIES (${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
     H5_SET_LIB_OPTIONS (
         ${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_PLUGIN_LIB_NAME}
@@ -155,6 +155,71 @@ TARGET_C_PROPERTIES (testhdf5 " " " ")
 TARGET_LINK_LIBRARIES (testhdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 SET_TARGET_PROPERTIES (testhdf5 PROPERTIES FOLDER test)
 
+MACRO (ADD_H5_EXE file)
+  ADD_EXECUTABLE (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
+  TARGET_NAMING (${file} ${LIB_TYPE})
+  TARGET_C_PROPERTIES (${file} " " " ")
+  TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+  SET_TARGET_PROPERTIES (${file} PROPERTIES FOLDER test)
+ENDMACRO (ADD_H5_EXE file)
+
+SET (H5_TESTS
+    accum
+    lheap
+    ohdr
+    stab
+    gheap
+    #cache
+    #cache_api
+    pool
+    hyperslab
+    istore
+    bittests
+    dt_arith
+    dtypes
+    dsets
+    cmpd_dset
+    filter_fail
+    extend
+    external
+    efc
+    objcopy
+    links
+    unlink
+    big
+    mtime
+    fillval
+    mount
+    flush1
+    flush2
+    app_ref
+    enum
+    set_extent
+    #ttsafe
+    getname
+    vfd
+    ntypes
+    dangle
+    dtransform
+    reserved
+    cross_read
+    freespace
+    mf
+    btree2
+    fheap
+    #error_test
+    #err_compat
+    tcheck_version
+    testmeta
+    #links_env
+    file_image
+    unregister
+)
+
+FOREACH (test ${H5_TESTS})
+  ADD_H5_EXE(${test})
+ENDFOREACH (test ${H5_TESTS})
+
 ##############################################################################
 ##############################################################################
 ###           A D D I T I O N A L   T E S T S                              ###
@@ -234,5 +299,4 @@ IF (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES (plugin PROPERTIES FOLDER test)
 ENDIF (BUILD_SHARED_LIBS)
 
-
 INCLUDE (CMakeTests.cmake)
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index da3539e..cc105e7 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -139,16 +139,6 @@ ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
 ##############################################################################
 ##############################################################################
 
-MACRO (ADD_H5_TEST file)
-  ADD_EXECUTABLE (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
-  TARGET_NAMING (${file} ${LIB_TYPE})
-  TARGET_C_PROPERTIES (${file} " " " ")
-  TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
-  SET_TARGET_PROPERTIES (${file} PROPERTIES FOLDER test)
-
-  ADD_TEST (NAME ${file} COMMAND $<TARGET_FILE:${file}>)
-ENDMACRO (ADD_H5_TEST file)
-
 # Remove any output file left over from previous test run
 ADD_TEST (
     NAME h5test-clear-objects
@@ -213,61 +203,8 @@ ADD_TEST (
         unregister_filter_2.h5
 )
 
-SET (H5_TESTS
-    accum
-    lheap
-    ohdr
-    stab
-    gheap
-    #cache
-    #cache_api
-    pool
-    hyperslab
-    istore
-    bittests
-    dt_arith
-    dtypes
-    dsets
-    cmpd_dset
-    filter_fail
-    extend
-    external
-    efc
-    objcopy
-    links
-    unlink
-    big
-    mtime
-    fillval
-    mount
-    flush1
-    flush2
-    app_ref
-    enum
-    set_extent
-    #ttsafe
-    getname
-    vfd
-    ntypes
-    dangle
-    dtransform
-    reserved
-    cross_read
-    freespace
-    mf
-    btree2
-    fheap
-    #error_test
-    #err_compat
-    tcheck_version
-    testmeta
-    #links_env
-    file_image
-    unregister
-)
-
 FOREACH (test ${H5_TESTS})
-  ADD_H5_TEST(${test})
+  ADD_TEST (NAME ${test} COMMAND $<TARGET_FILE:${test}>)
   SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS h5test-clear-objects)
 ENDFOREACH (test ${H5_TESTS})
 
diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
index b322460..ddc995e 100644
--- a/test/testfiles/error_test_1
+++ b/test/testfiles/error_test_1
@@ -56,5 +56,8 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #004: (file name) line (number) in H5Z_pipeline(): required filter 'bogus' is not registered
     major: Data filters
     minor: Read failed
+  #005: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '305' is not available
+    major: Plugin for dynamically loaded library
+    minor: Unable to load metadata into cache
 
 All error API tests passed.