Revert "Merge latest changes from develop"

This reverts commit 104d63f25a8cb6e156bc901eb85aafc0b67775ee.

1 files changed, 24 insertions, 113 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9657971..8891af7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.1.0)
 PROJECT (HDF5_TEST)
 
 #-----------------------------------------------------------------------------
@@ -20,23 +20,21 @@ set (TEST_LIB_SOURCES
     ${HDF5_TEST_SOURCE_DIR}/h5test.c
     ${HDF5_TEST_SOURCE_DIR}/testframe.c
     ${HDF5_TEST_SOURCE_DIR}/cache_common.c
-    ${HDF5_TEST_SOURCE_DIR}/swmr_common.c
 )
 
 set (TEST_LIB_HEADERS
     ${HDF5_TEST_SOURCE_DIR}/h5test.h
     ${HDF5_TEST_SOURCE_DIR}/cache_common.h
-    ${HDF5_TEST_SOURCE_DIR}/swmr_common.h
 )
 
 add_library (${HDF5_TEST_LIB_TARGET} STATIC ${TEST_LIB_SOURCES} ${TEST_LIB_HEADERS})
 TARGET_C_PROPERTIES (${HDF5_TEST_LIB_TARGET} STATIC " " " ")
 if (MSVC)
   target_link_libraries (${HDF5_TEST_LIB_TARGET} "ws2_32.lib")
-endif ()
+endif (MSVC)
 if (MINGW)
   target_link_libraries (${HDF5_TEST_LIB_TARGET} "wsock32.lib")
-endif ()
+endif (MINGW)
 target_link_libraries (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} STATIC)
 set_target_properties (${HDF5_TEST_LIB_TARGET} PROPERTIES
@@ -49,10 +47,10 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (${HDF5_TEST_LIBSH_TARGET} SHARED " " " ")
   if (MSVC)
     target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "ws2_32.lib")
-  endif ()
+  endif (MSVC)
   if (MINGW)
     target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "wsock32.lib")
-  endif ()
+  endif (MINGW)
   target_link_libraries (${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   H5_SET_LIB_OPTIONS (${HDF5_TEST_LIBSH_TARGET} ${HDF5_TEST_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_TEST_LIBSH_TARGET} PROPERTIES
@@ -66,8 +64,8 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif ()
-endif ()
+  endif (HDF5_ENABLE_THREADSAFE)
+endif (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 # If plugin library tests can be tested
@@ -112,7 +110,7 @@ endif ()
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir1/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
-  endforeach ()
+  endforeach (test_lib ${TEST_PLUGIN_LIBS})
 
   foreach (test_lib ${TEST2_PLUGIN_LIBS})
     set (HDF5_TEST_PLUGIN_LIB_CORENAME         "${test_lib}")
@@ -138,7 +136,7 @@ endif ()
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir2/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
-  endforeach ()
+  endforeach (test_lib ${TEST2_PLUGIN_LIBS})
 
 set (testhdf5_SOURCES
     ${HDF5_TEST_SOURCE_DIR}/testhdf5.c
@@ -180,7 +178,7 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (testhdf5-shared SHARED " " " ")
   target_link_libraries (testhdf5-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (testhdf5-shared PROPERTIES FOLDER test)
-endif ()
+endif (BUILD_SHARED_LIBS)
 
 MACRO (ADD_H5_EXE file)
   add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
@@ -194,8 +192,8 @@ MACRO (ADD_H5_EXE file)
     TARGET_C_PROPERTIES (${file}-shared SHARED " " " ")
     target_link_libraries (${file}-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
     set_target_properties (${file}-shared PROPERTIES FOLDER test)
-  endif ()
-ENDMACRO ()
+  endif (BUILD_SHARED_LIBS)
+ENDMACRO (ADD_H5_EXE file)
 
 set (H5_TESTS
     cache
@@ -225,7 +223,6 @@ set (H5_TESTS
     objcopy
     links
     unlink
-    twriteorder
     big
     mtime
     fillval
@@ -256,34 +253,15 @@ set (H5_TESTS
 
 foreach (test ${H5_TESTS})
   ADD_H5_EXE(${test})
-endforeach ()
+endforeach (test ${H5_TESTS})
 
 set (H5_SWMR_TESTS
-    swmr_addrem_writer
     swmr_check_compat_vfd
-    swmr_generator
-    swmr_reader
-    swmr_remove_reader
-    swmr_remove_writer
-    swmr_sparse_reader
-    swmr_sparse_writer
-    swmr_start_write
-    swmr_writer
 )
 
 foreach (test ${H5_SWMR_TESTS})
   ADD_H5_EXE(${test})
-endforeach ()
-
-set (H5_VDS_SWMR_TESTS
-    vds_swmr_gen
-    vds_swmr_reader
-    vds_swmr_writer
-)
-
-foreach (test ${H5_VDS_SWMR_TESTS})
-  ADD_H5_EXE(${test})
-endforeach ()
+endforeach (test ${H5_SWMR_TESTS})
 
 ##############################################################################
 ##############################################################################
@@ -291,26 +269,6 @@ endforeach ()
 ##############################################################################
 ##############################################################################
 
-#-- Adding test for cache_image
-add_executable (cache_image
-    ${HDF5_TEST_SOURCE_DIR}/cache_image.c
-    ${HDF5_TEST_SOURCE_DIR}/genall5.c
-)
-TARGET_NAMING (cache_image STATIC)
-TARGET_C_PROPERTIES (cache_image STATIC " " " ")
-target_link_libraries (cache_image ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-set_target_properties (cache_image PROPERTIES FOLDER test)
-if (BUILD_SHARED_LIBS)
-  add_executable (cache_image-shared
-    ${HDF5_TEST_SOURCE_DIR}/cache_image.c
-    ${HDF5_TEST_SOURCE_DIR}/genall5.c
-  )
-  TARGET_NAMING (cache_image-shared SHARED)
-  TARGET_C_PROPERTIES (cache_image-shared SHARED " " " ")
-  target_link_libraries (cache_image-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (cache_image-shared PROPERTIES FOLDER test)
-endif ()
-
 #-- Adding test for hyperslab
 add_executable (hyperslab ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
 TARGET_NAMING (hyperslab STATIC)
@@ -328,8 +286,8 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif ()
-endif ()
+  endif (HDF5_ENABLE_THREADSAFE)
+endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for ttsafe
 add_executable (ttsafe
@@ -360,23 +318,21 @@ if (BUILD_SHARED_LIBS)
         APPEND PROPERTY COMPILE_DEFINITIONS
             "H5_HAVE_THREADSAFE"
     )
-  endif ()
-endif ()
+  endif (HDF5_ENABLE_THREADSAFE)
+endif (BUILD_SHARED_LIBS)
 
 set (H5_CHECK_TESTS
     error_test
     err_compat
     tcheck_version
     testmeta
-    atomic_writer
-    atomic_reader
     links_env
     flushrefresh
 )
 
 foreach (test ${H5_CHECK_TESTS})
   ADD_H5_EXE(${test})
-endforeach ()
+endforeach (test ${H5_CHECK_TESTS})
 
 #-- Adding test for accum_swmr_reader
 #   This has to be copied to the test directory for execve() to find it
@@ -391,7 +347,7 @@ set_target_properties (accum_swmr_reader PROPERTIES FOLDER test)
 set_target_properties (accum PROPERTIES DEPENDS accum_swmr_reader)
 if (BUILD_SHARED_LIBS)
   set_target_properties (accum-shared PROPERTIES DEPENDS accum_swmr_reader)
-endif ()
+endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
@@ -399,9 +355,9 @@ file (WRITE ${GREP_RUNNER}
   "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
 if (\${TEST_RESULT} STREQUAL \"0\")
   message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
-else ()
+else (\${TEST_RESULT} STREQUAL \"0\")
   message (STATUS \"COMMAND Result: \${TEST_RESULT}\")
-endif ()
+endif (\${TEST_RESULT} STREQUAL \"0\")
 "
 )
 
@@ -414,57 +370,12 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (plugin SHARED " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
-else ()
+else (BUILD_SHARED_LIBS)
   add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c)
   TARGET_NAMING (plugin STATIC)
   TARGET_C_PROPERTIES (plugin STATIC " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
-endif ()
-
-##############################################################################
-###    U S E  C A S E S  T E S T S
-##############################################################################
-set (use_append_chunk_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_chunk.c ${HDF5_TEST_SOURCE_DIR}/use_common.c)
-add_executable (use_append_chunk ${use_append_chunk_SOURCES})
-TARGET_NAMING (use_append_chunk STATIC)
-TARGET_C_PROPERTIES (use_append_chunk STATIC " " " ")
-target_link_libraries (use_append_chunk ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-set_target_properties (use_append_chunk PROPERTIES FOLDER test)
-if (BUILD_SHARED_LIBS)
-  add_executable (use_append_chunk-shared ${use_append_chunk_SOURCES})
-  TARGET_NAMING (use_append_chunk-shared SHARED)
-  TARGET_C_PROPERTIES (use_append_chunk-shared SHARED " " " ")
-  target_link_libraries (use_append_chunk-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (use_append_chunk-shared PROPERTIES FOLDER test)
-endif ()
-
-set (use_append_mchunks_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_mchunks.c ${HDF5_TEST_SOURCE_DIR}/use_common.c)
-add_executable (use_append_mchunks ${use_append_mchunks_SOURCES})
-TARGET_NAMING (use_append_mchunks STATIC)
-TARGET_C_PROPERTIES (use_append_mchunks STATIC " " " ")
-target_link_libraries (use_append_mchunks ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-set_target_properties (use_append_mchunks PROPERTIES FOLDER test)
-if (BUILD_SHARED_LIBS)
-  add_executable (use_append_mchunks-shared ${use_append_mchunks_SOURCES})
-  TARGET_NAMING (use_append_mchunks-shared SHARED)
-  TARGET_C_PROPERTIES (use_append_mchunks-shared SHARED " " " ")
-  target_link_libraries (use_append_mchunks-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (use_append_mchunks-shared PROPERTIES FOLDER test)
-endif ()
-
-set (use_disable_mdc_flushes_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_disable_mdc_flushes.c)
-add_executable (use_disable_mdc_flushes ${use_disable_mdc_flushes_SOURCES})
-TARGET_NAMING (use_disable_mdc_flushes STATIC)
-TARGET_C_PROPERTIES (use_disable_mdc_flushes STATIC " " " ")
-target_link_libraries (use_disable_mdc_flushes ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-set_target_properties (use_disable_mdc_flushes PROPERTIES FOLDER test)
-if (BUILD_SHARED_LIBS)
-  add_executable (use_disable_mdc_flushes-shared ${use_disable_mdc_flushes_SOURCES})
-  TARGET_NAMING (use_disable_mdc_flushes-shared SHARED)
-  TARGET_C_PROPERTIES (use_disable_mdc_flushes-shared SHARED " " " ")
-  target_link_libraries (use_disable_mdc_flushes-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  set_target_properties (use_disable_mdc_flushes-shared PROPERTIES FOLDER test)
-endif ()
+endif (BUILD_SHARED_LIBS)
 
 include (CMakeTests.cmake)