diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-10-23 19:49:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-10-23 19:49:05 (GMT) |
| commit | 9affb7f12ec6084ccaadec9fcdc8d94bccf4dd4f (patch) | |
| tree | 6c4ea1273b555ee4de5bcdc5e7f5fc6d098fb4d2 | |
| parent | 20292df3675e5cb4296d743f435bbbe1a3136f2b (diff) | |
| download | hdf5-9affb7f12ec6084ccaadec9fcdc8d94bccf4dd4f.zip hdf5-9affb7f12ec6084ccaadec9fcdc8d94bccf4dd4f.tar.gz hdf5-9affb7f12ec6084ccaadec9fcdc8d94bccf4dd4f.tar.bz2 | |
Fix MPI test depends
| -rw-r--r-- | config/cmake/CTestCustom.cmake | 4 | ||||
| -rw-r--r-- | config/toolchain/mingw64.cmake | 14 | ||||
| -rw-r--r-- | testpar/CMakeVFDTests.cmake | 3 | ||||
| -rw-r--r-- | tools/test/h5diff/CMakeTests.cmake | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index a05f906..7ee5737 100644 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -11,8 +11,8 @@ # set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000) # Allow full output to go to CDash set to 0 -SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 50000) -SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 50000) +set (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 50000) +set (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 50000) # WARNING! This could be a lot of output and could overwhelm CDash and the # MySQL DB so this might not be a good idea! diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake index 721c39a..fde5e38 100644 --- a/config/toolchain/mingw64.cmake +++ b/config/toolchain/mingw64.cmake @@ -1,10 +1,14 @@ +set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) set (CMAKE_SYSTEM_NAME Windows) -set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) -set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) -set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) -set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran) -set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) +set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) +set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) +set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) +set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran) +set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/local/${TOOLCHAIN_PREFIX}) set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set (CMAKE_CROSSCOMPILING_EMULATOR wine64) + +include_directories(/usr/local/${TOOLCHAIN_PREFIX}/include) +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols") diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake index 8d131db..4d6b18c 100644 --- a/testpar/CMakeVFDTests.cmake +++ b/testpar/CMakeVFDTests.cmake @@ -58,6 +58,9 @@ macro (ADD_VFD_TEST vfdname resultcode) WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname} ) endforeach () + set_tests_properties (MPI_TEST_VFD-${vfdname}-pflush1 PROPERTIES WILL_FAIL "true") + #set_property (TEST MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED") + set_tests_properties (MPI_TEST_VFD-${vfdname}-pflush2 PROPERTIES DEPENDS MPI_TEST_VFD-${vfdname}-pflush1) endif () endmacro () diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index 93dfd72..57bcd12 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -426,7 +426,7 @@ if (last_test) set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test}) endif () - set (last_test "PH5DIFF-${resultfile}") + set (last_test "MPI_TEST_H5DIFF-${resultfile}") endif () endmacro () |