diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-31 01:31:11 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-31 01:31:11 (GMT) |
| commit | 6e0d81dc8b65dc078fa31dae50acf96f3ce372e7 (patch) | |
| tree | 588378063a4eae446ffe0c7e684f4e3aff6af358 /config/cmake/userblockTest.cmake | |
| parent | fdbbe61bcf2c5bcbea8a4e08bd6ce8c62f7b43bc (diff) | |
| parent | 799a732650735b8ad05a0398781d2a26ec47b288 (diff) | |
| download | hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.zip hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.tar.gz hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.tar.bz2 | |
Merge pull request #1629 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:feature/json_vol to feature/json_vol
* commit '799a732650735b8ad05a0398781d2a26ec47b288': (185 commits)
Updated the VOL struct. The json_vol test fails, though, because the plugin can't be found. Will diagnose later.
Correct examples for packaging
HDFFV-10738 Wrong INTENT for H5LTread_dataset_double_f
Changes that show the right way to iterate over enums.
Changes that show the right way to iterate over enums.
Test improvement Description Moved the new tests to a more appropriate test function. Platforms tested: Linux/64 (jelly)
Used the H5_INC_ENUM macro to squash enum value increment warnings.
Fixed HDFFV-10210 and HDFFV-10587 Description: - Added parameter validation (HDFFV-10210) - Added detection of division by zero (HDFFV-10587 - CVE-2018-17438) - Fixed typos in various tests Platforms tested: Linux/64 (jelly) Linux/64 (platypus) Darwin (osx1011test)
Fix CMake error in name
Commented out memcpy overlap check while we investigate parallel filters issues.
Yanked check for memcpy n > 0
- Added H5MMprivate.h #includes where needed - Added casts to quiet H5MM_memcpy warnings - Removed char * casts from HDmemcpy
Added an H5MM_memcpy call that checks for buffer overlap.
Added the HDopen work-around on windows to pio_engine.c
Adds _wopen support on Windows so that files with UTF-8 names can be opened.
CMake: fix pthread linking to only be private
Add API routines to retrieve, restore, reset, and free library state.
Added a note of bug fix for HDFFV-10705.
Fixed the MANIFEST
Fix issue with direct chunk write not updating the "last chunk" index cache. Fix issues involving datasets being "no allocated" when they contain cached raw data.
...
Diffstat (limited to 'config/cmake/userblockTest.cmake')
| -rw-r--r-- | config/cmake/userblockTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake index 9af7e5b..4a580d0 100644 --- a/config/cmake/userblockTest.cmake +++ b/config/cmake/userblockTest.cmake @@ -62,7 +62,7 @@ if (TEST_CHECKUB STREQUAL "YES") OUTPUT_VARIABLE TEST_OUT ERROR_VARIABLE TEST_ERROR ) - if (NOT ${TEST_RESULT} STREQUAL "0") + if (TEST_RESULT) message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} ${TEST_OFILE} is: ${TEST_ERROR}") endif () file (READ ${TEST_HFILE}.len.txt TEST_O_STRING_LEN) @@ -70,7 +70,7 @@ if (TEST_CHECKUB STREQUAL "YES") math( EXPR TEST_STRING_SIZE "${TEST_U_STRING_LEN} + ${TEST_O_STRING_LEN}" ) - if (NOT TEST_O_STRING_LEN STREQUAL "0") + if (TEST_O_STRING_LEN) #$JAM_BIN/getub -c $s2 $origfile > $cmpfile EXECUTE_PROCESS ( COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE} @@ -108,7 +108,7 @@ if (TEST_CHECKUB STREQUAL "YES") message (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}") # if the return value is !=${TEST_EXPECT} bail out - if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT}) + if (NOT TEST_RESULT EQUAL TEST_EXPECT) message (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}") endif () else () @@ -121,7 +121,7 @@ else () OUTPUT_VARIABLE TEST_OUT ERROR_VARIABLE TEST_ERROR ) - if (NOT TEST_H_STRING_LEN STREQUAL "0") + if (TEST_H_STRING_LEN) message (FATAL_ERROR "Failed: The output of ${TEST_HFILE} was NOT empty") endif () endif () |