diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-13 18:44:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-13 18:44:40 (GMT) |
| commit | bbdb0306556459531d9e19bc6dae3c602341bdcf (patch) | |
| tree | db1ed7bf225b4b850e6228716870e7c66068a137 /config | |
| parent | b49b22d6882d97b1ec01d482822955bd8e923203 (diff) | |
| parent | 44e4f16e1df69f4facc82bf7aaafaa16e9aee85f (diff) | |
| download | hdf5-bbdb0306556459531d9e19bc6dae3c602341bdcf.zip hdf5-bbdb0306556459531d9e19bc6dae3c602341bdcf.tar.gz hdf5-bbdb0306556459531d9e19bc6dae3c602341bdcf.tar.bz2 | |
Merge pull request #2135 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit '44e4f16e1df69f4facc82bf7aaafaa16e9aee85f':
Revert and move declaration
Correct compile and test Windows errors
HDFFV-10979 cleanup global names
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/jrunTest.cmake | 8 | ||||
| -rw-r--r-- | config/cmake_ext_mod/grepTest.cmake | 4 | ||||
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index e736b7a..ee4517c 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -126,7 +126,9 @@ if (NOT TEST_SKIP_COMPARE) if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}") if (WIN32 OR MINGW) configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) - file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") + file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + endif () #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") endif () @@ -190,7 +192,9 @@ if (NOT TEST_SKIP_COMPARE) if (TEST_ERRREF) if (WIN32 OR MINGW) configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) - file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) + if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") + file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) + endif () #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}") endif () diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake index 78ee0da..a6f1c7f 100644 --- a/config/cmake_ext_mod/grepTest.cmake +++ b/config/cmake_ext_mod/grepTest.cmake @@ -100,7 +100,9 @@ if (TEST_ERRREF) if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}") if (WIN32 OR MINGW) configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) - file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") + file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + endif () #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") endif () diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index 6f633f3..0c4a5a0 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/runTest.cmake @@ -207,7 +207,9 @@ if (NOT TEST_SKIP_COMPARE) if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}") if (WIN32 OR MINGW) configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) - file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") + file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + endif () #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") endif () @@ -271,7 +273,9 @@ if (NOT TEST_SKIP_COMPARE) if (TEST_ERRREF) if (WIN32 OR MINGW) configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) - file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) + if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") + file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) + endif () #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}") endif () |