diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-21 19:58:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-21 19:58:09 (GMT) |
| commit | 78bce9b4b389b0f78d8200bc257a76dcb7380b49 (patch) | |
| tree | 18cc387afd8f0f37c334c17ca9e48e68d6c4d92b /tools/misc | |
| parent | 13edfb217585eee6fe9f9f20d0b3198c1bb5af98 (diff) | |
| download | hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.zip hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.tar.gz hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.tar.bz2 | |
[svn-r20128] Add fortran mod folder to INCLUDE_DIRS for gfortran 4.2.x.
Add test dependicies to correct the order of tests - cmake 2.8.4 bug - but also will improve cmake parallel testing.
Tested: local linux, jam
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index e94d9dc..6694458 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -144,6 +144,7 @@ IF (BUILD_TESTING) COMMAND $<TARGET_FILE:h5mkgrp> ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN} ) ENDIF (NOT ${resultoption} STREQUAL " ") + SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption}) ADD_TEST ( NAME H5MKGRP-H5LS-${resultfile}${resultoption} COMMAND "${CMAKE_COMMAND}" @@ -156,6 +157,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + SET_TESTS_PROPERTIES (H5MKGRP-H5LS-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption}) ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption) MACRO (ADD_H5_CMP resultfile resultcode) @@ -187,6 +189,7 @@ IF (BUILD_TESTING) ) # repartition family member size to 20,000 bytes. ADD_TEST (NAME h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5) + SET_TESTS_PROPERTIES (h5repart_20K PROPERTIES DEPENDS h5repart_20K-clear-objects) # Remove any output file left over from previous test run ADD_TEST ( @@ -200,6 +203,7 @@ IF (BUILD_TESTING) ) # repartition family member size to 5 KB. ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5) + SET_TESTS_PROPERTIES (h5repart_5K PROPERTIES DEPENDS h5repart_5K-clear-objects) # Remove any output file left over from previous test run ADD_TEST ( @@ -210,9 +214,11 @@ IF (BUILD_TESTING) ) # convert family file to sec2 file of 20,000 bytes ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5) + SET_TESTS_PROPERTIES (h5repart_sec2 PROPERTIES DEPENDS h5repart_sec2-clear-objects) # test the output files repartitioned above. ADD_TEST (NAME h5repart_test COMMAND $<TARGET_FILE:h5repart_test>) + SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2 h5repart_5K h5repart_20K) SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repart_test |