diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-05 17:11:28 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-05 17:11:28 (GMT) |
| commit | 783f01f478f99711710b24d8c85b0555dcdcf1fc (patch) | |
| tree | 2fce87a76b5dfc7012432d9ce45b0934404f0d51 /hl | |
| parent | 620bfd58ae44dcf876303efb99482019ebbb9b6a (diff) | |
| parent | 8c49b6e05a7d40218b8129b29bd74bbd2b39758d (diff) | |
| download | hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.zip hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.tar.gz hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.tar.bz2 | |
Merge pull request #57 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
All changes tested in Buildbot and locally.
* commit '8c49b6e05a7d40218b8129b29bd74bbd2b39758d':
HDFFV-9991: Remove uneeded file
Fix missing defines for standalone perf
Remove hanging property set
Revert clear objects for testfile removal
Merge test output file clearing into runTest.cmake
Move clear-objects inside runTest
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/tools/gif2h5/CMakeTests.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake index 1cffe55..1dda0f5 100644 --- a/hl/tools/gif2h5/CMakeTests.cmake +++ b/hl/tools/gif2h5/CMakeTests.cmake @@ -26,16 +26,21 @@ add_test ( image.gif image24.gif ) +set_tests_properties (HL_TOOLS-clear-objects PROPERTIES DEPENDS HL_TOOLS-clear-objects) add_test (NAME HL_TOOLS_gif2h5 COMMAND $<TARGET_FILE:gif2h5> testfiles/image1.gif image1.h5) +set_tests_properties (HL_TOOLS-clear-objects PROPERTIES DEPENDS HL_TOOLS-clear-objects) add_test (NAME HL_TOOLS_h52gif COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image1.gif -i image) +set_tests_properties (HL_TOOLS-clear-objects PROPERTIES DEPENDS HL_TOOLS-clear-objects) add_test (NAME HL_TOOLS_h52gif_none COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i nosuch_image) set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES WILL_FAIL "true") +set_tests_properties (HL_TOOLS-clear-objects PROPERTIES DEPENDS HL_TOOLS-clear-objects) #add_test (NAME HL_TOOLS_h52gifpal COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i palette) #set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES WILL_FAIL "true") add_test (NAME HL_TOOLS_h52gif24bits COMMAND $<TARGET_FILE:h52gif> testfiles/ex_image2.h5 image24.gif -i image24bitpixel) set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES WILL_FAIL "true") +set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES DEPENDS HL_TOOLS-clear-objects) |