summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorM. Scot Breitenfeld <brtnfld@hdfgroup.org>2019-06-13 20:47:55 (GMT)
committerM. Scot Breitenfeld <brtnfld@hdfgroup.org>2019-06-13 20:47:55 (GMT)
commitb08685f5036e21cbce0227797d9bc3e00a36c2ff (patch)
tree054bd0de71b0ac15f3f11755582bfbeaa21a4690 /fortran/test
parent46a62130faf4ac168a4b33e3d5551446c73fa4e6 (diff)
downloadhdf5-b08685f5036e21cbce0227797d9bc3e00a36c2ff.zip
hdf5-b08685f5036e21cbce0227797d9bc3e00a36c2ff.tar.gz
hdf5-b08685f5036e21cbce0227797d9bc3e00a36c2ff.tar.bz2
updated static vol_connector build
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/CMakeTests.cmake20
1 files changed, 18 insertions, 2 deletions
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index baefb8f..45f14d1 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -131,8 +131,24 @@ add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
#-- Adding test for vol_connector
-add_test (NAME FORTRAN_vol_connector COMMAND $<TARGET_FILE:vol_connector>)
-set_tests_properties (FORTRAN_vol_connector PROPERTIES DEPENDS FORTRAN_testhdf5-clear-objects)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+ add_test (NAME FORTRAN_vol_connector COMMAND $<TARGET_FILE:vol_connector>)
+else ()
+ add_test (NAME FORTRAN_vol_connector COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_PROGRAM=$<TARGET_FILE:vol_connector>"
+ -D "TEST_ARGS:STRING="
+ -D "TEST_EXPECT=0"
+ -D "TEST_SKIP_COMPARE=TRUE"
+ -D "TEST_REGEX= 0 error.s."
+ -D "TEST_MATCH= 0 error(s)"
+ -D "TEST_OUTPUT=vol_connector.txt"
+ #-D "TEST_REFERENCE=vol_connector.out"
+ -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+ -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+ )
+endif ()
+# set_tests_properties (FORTRAN_vol_connector PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+ set_tests_properties (FORTRAN_vol_connector PROPERTIES DEPENDS FORTRAN_fortranlib_test_F03)
if (BUILD_SHARED_LIBS)
add_test (