[svn-r25188] Implement change to cmake_ext_mod config folder

Tested: local linux

2 files changed, 13 insertions, 10 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dcbe9d4..b99447a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TEST)
 #-----------------------------------------------------------------------------
 # Apply Definitions to compiler in this directory and below
 #-----------------------------------------------------------------------------
-add_definitions (${HDF5_EXTRA_C_FLAGS})
+add_definitions (${HDF_EXTRA_C_FLAGS})
 
 #-----------------------------------------------------------------------------
 # Generate the H5srcdir_str.h file containing user settings needed by compilation
@@ -64,7 +64,7 @@ if (BUILD_SHARED_LIBS)
     set (HDF5_TEST_PLUGIN_LIB_CORENAME         "${test_lib}")
     set (HDF5_TEST_PLUGIN_LIB_NAME             "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_LIB_CORENAME}")
     set (HDF5_TEST_PLUGIN_LIB_TARGET           ${HDF5_TEST_PLUGIN_LIB_CORENAME})
-    add_definitions (${HDF5_EXTRA_C_FLAGS})
+    add_definitions (${HDF_EXTRA_C_FLAGS})
     INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
 
     add_library (${HDF5_TEST_PLUGIN_LIB_TARGET} ${LIB_TYPE} ${HDF5_TEST_SOURCE_DIR}/${test_lib}.c)
@@ -95,7 +95,7 @@ if (BUILD_SHARED_LIBS)
     set (HDF5_TEST_PLUGIN_LIB_CORENAME         "${test_lib}")
     set (HDF5_TEST_PLUGIN_LIB_NAME             "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_LIB_CORENAME}")
     set (HDF5_TEST_PLUGIN_LIB_TARGET           ${HDF5_TEST_PLUGIN_LIB_CORENAME})
-    add_definitions (${HDF5_EXTRA_C_FLAGS})
+    add_definitions (${HDF_EXTRA_C_FLAGS})
     INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
 
     add_library (${HDF5_TEST_PLUGIN_LIB_TARGET} ${LIB_TYPE} ${HDF5_TEST_SOURCE_DIR}/${test_lib}.c)
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index cf3c54b..23cc8eb 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -322,7 +322,7 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
       -D "TEST_OUTPUT=err_compat.txt"
       -D "TEST_REFERENCE=err_compat_1"
       -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-      -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
   set_tests_properties (H5TEST-err_compat PROPERTIES DEPENDS H5TEST-clear-err_compat-objects)
 endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
@@ -343,7 +343,7 @@ add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
     -D "TEST_OUTPUT=error_test.txt"
     -D "TEST_REFERENCE=error_test_1"
     -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-    -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
+    -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
 )
 set_tests_properties (H5TEST-error_test PROPERTIES DEPENDS H5TEST-clear-error_test-objects)
 set_tests_properties (H5TEST-error_test PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PRELOAD=::")
@@ -368,7 +368,7 @@ add_test (NAME H5TEST-links_env COMMAND "${CMAKE_COMMAND}"
     -D "TEST_OUTPUT=links_env.txt"
     -D "TEST_REFERENCE=links_env.out"
     -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-    -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
+    -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
 )
 set_tests_properties (H5TEST-links_env PROPERTIES DEPENDS H5TEST-clear-links_env-objects)
 
@@ -438,7 +438,7 @@ if (HDF5_TEST_VFD)
       objcopy
       links
       unlink
-      big
+#      big
       mtime
       fillval
       mount
@@ -467,7 +467,10 @@ if (HDF5_TEST_VFD)
       testmeta
       links_env
       unregister
-)
+  )
+  if (NOT CYGWIN)
+    set (H5_VFD_TESTS ${H5_VFD_TESTS} big)
+  endif (NOT CYGWIN)
   
   if (DIRECT_VFD)
     set (VFD_LIST ${VFD_LIST} direct)
@@ -484,7 +487,7 @@ if (HDF5_TEST_VFD)
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_OUTPUT=${test}"
             -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-            -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake"
+            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
       )
     endforeach (test ${H5_VFD_TESTS})
     if (HDF5_TEST_FHEAP_VFD)
@@ -497,7 +500,7 @@ if (HDF5_TEST_VFD)
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_OUTPUT=fheap"
             -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-            -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake"
+            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
       )
     endif (HDF5_TEST_FHEAP_VFD)
   ENDMACRO (ADD_VFD_TEST)