diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-11-29 13:46:34 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-11-29 13:46:34 (GMT) |
| commit | 49b99cf1b058eec8f23ce78b85f68a8305e9785e (patch) | |
| tree | 3b92096dbcd5479bb2ded1804ad5e1755d7a8e73 /config/cmake/jrunTest.cmake | |
| parent | 9572872ad7a4c06f362fd37f26c35890238caed2 (diff) | |
| parent | 4fea1bcccd283a407fe0936c56e56cc40a019b3c (diff) | |
| download | hdf5-49b99cf1b058eec8f23ce78b85f68a8305e9785e.zip hdf5-49b99cf1b058eec8f23ce78b85f68a8305e9785e.tar.gz hdf5-49b99cf1b058eec8f23ce78b85f68a8305e9785e.tar.bz2 | |
Merge branch 'develop' into zzz-gitlab-ci
Diffstat (limited to 'config/cmake/jrunTest.cmake')
| -rw-r--r-- | config/cmake/jrunTest.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index 41570eb..7d59ce5 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -49,7 +49,7 @@ endif () message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}") -if (WIN32 OR MINGW) +if (WIN32) set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") @@ -131,7 +131,7 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - if (WIN32 OR MINGW) + if (WIN32) configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) @@ -202,7 +202,7 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - if (WIN32 OR MINGW) + if (WIN32) configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) |