diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-13 18:47:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-13 18:47:10 (GMT) |
| commit | 568e30ef0d40f9a296b387f4ec4f42d2cbbbd641 (patch) | |
| tree | 9d06326f9d39dcce40bbec51f5f09de20ebde325 /config/cmake/jrunTest.cmake | |
| parent | 7aedeedf67adf688c8683acf392c21393c64fb22 (diff) | |
| parent | dc2cbdaf6720b6c3af72846989dfdbec4f207208 (diff) | |
| download | hdf5-568e30ef0d40f9a296b387f4ec4f42d2cbbbd641.zip hdf5-568e30ef0d40f9a296b387f4ec4f42d2cbbbd641.tar.gz hdf5-568e30ef0d40f9a296b387f4ec4f42d2cbbbd641.tar.bz2 | |
Merge pull request #2133 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'dc2cbdaf6720b6c3af72846989dfdbec4f207208':
Revert and move declaration
Correct struct access
Fix duplicate and varname
Fix compile and test issues from DT
Add release note for sanitizer support
HDFFV-10979 cleanup globals
TRILABS-135 Add clang analyzers
Diffstat (limited to 'config/cmake/jrunTest.cmake')
| -rw-r--r-- | config/cmake/jrunTest.cmake | 8 |
1 files changed, 6 insertions, 2 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 () |