summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-03-16 17:35:51 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-03-16 17:35:51 (GMT)
commit7f8f2feaf9097e92757bd6d5743e7e17baba5f76 (patch)
tree78f90b9c01fe89119b7901ef8288311fdbf6f55b /config
parent1f5286ddf2cdf6162bfb9baab18e067658fbfabf (diff)
downloadhdf5-7f8f2feaf9097e92757bd6d5743e7e17baba5f76.zip
hdf5-7f8f2feaf9097e92757bd6d5743e7e17baba5f76.tar.gz
hdf5-7f8f2feaf9097e92757bd6d5743e7e17baba5f76.tar.bz2
[svn-r29450] Separate error compare from output compare
Diffstat (limited to 'config')
-rw-r--r--config/cmake/jrunTest.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 7a92867..6c9bbdd 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} TEST_STREAM)
- else (NOT TEST_ERRREF)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+ else (NOT TEST_ERRREF)
+ file (READ ${TEST_FOLDER}/${TEST_OUTPUT} 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} "${TEST_STREAM}")
- else (NOT TEST_ERRREF)
file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+ else (NOT TEST_ERRREF)
+ file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
endif (NOT TEST_ERRREF)
endif (TEST_MASK_ERROR)