diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-23 17:42:06 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-23 17:42:06 (GMT) |
| commit | 5a9a9e8f0ee8bee687c99bcc3a1b2414e10a9ba7 (patch) | |
| tree | ac24638ebced42fb499ad3e526781b0a6687c5fa /config/cmake | |
| parent | 710d1caf54cc4edb47ef83280b6d5a1af445b9d1 (diff) | |
| download | hdf5-5a9a9e8f0ee8bee687c99bcc3a1b2414e10a9ba7.zip hdf5-5a9a9e8f0ee8bee687c99bcc3a1b2414e10a9ba7.tar.gz hdf5-5a9a9e8f0ee8bee687c99bcc3a1b2414e10a9ba7.tar.bz2 | |
[svn-r29534] Normalization w/ revise_chunks in preparation for big merge.
tools directory
Also fixes a minor Java test output error.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Java, Fortran, & C++
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/jrunTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index 6c9bbdd..7a92867 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -72,9 +72,9 @@ endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err) if (TEST_MASK_ERROR) if (NOT TEST_ERRREF) - file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM) - else (NOT TEST_ERRREF) file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) + else (NOT TEST_ERRREF) + file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM) endif (NOT TEST_ERRREF) string (REGEX REPLACE "Time:[^\n]+\n" "Time: XXXX\n" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") @@ -85,9 +85,9 @@ if (TEST_MASK_ERROR) string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") if (NOT TEST_ERRREF) - file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}") - else (NOT TEST_ERRREF) file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") + else (NOT TEST_ERRREF) + file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}") endif (NOT TEST_ERRREF) endif (TEST_MASK_ERROR) |