diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-13 19:40:51 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-13 19:40:51 (GMT) |
| commit | 05a218df3c49c6da63fb2a337022cdcd6eb94968 (patch) | |
| tree | f5b3e3493b9e8deb49c8212704169d062f8299d3 /hl/test | |
| parent | 57ac83f5ba546fe9c86479c5cb3c303f8ff33881 (diff) | |
| parent | 8df5a96ccb3d60bc38d9f1b6d0d774d55afbb7a6 (diff) | |
| download | hdf5-05a218df3c49c6da63fb2a337022cdcd6eb94968.zip hdf5-05a218df3c49c6da63fb2a337022cdcd6eb94968.tar.gz hdf5-05a218df3c49c6da63fb2a337022cdcd6eb94968.tar.bz2 | |
[svn-r25280] merge from latest VOL/trunk branch.
Diffstat (limited to 'hl/test')
| -rw-r--r-- | hl/test/CMakeTests.cmake | 10 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/test/test_image.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake index fda388a..7d632cc 100644 --- a/hl/test/CMakeTests.cmake +++ b/hl/test/CMakeTests.cmake @@ -9,9 +9,9 @@ # Macro used to add a unit test # -------------------------------------------------------------------- MACRO (HL_ADD_TEST hl_name files) - add_test (NAME hl_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>) + add_test (NAME HL_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>) if (NOT "${last_test}" STREQUAL "") - set_tests_properties (hl_${hl_name} PROPERTIES DEPENDS ${last_test}) + set_tests_properties (HL_${hl_name} PROPERTIES DEPENDS ${last_test}) endif (NOT "${last_test}" STREQUAL "") # -------------------------------------------------------------------- @@ -32,7 +32,7 @@ ENDMACRO (HL_ADD_TEST) # Remove any output file left over from previous test run add_test ( - NAME hl_test-clear-objects + NAME HL_test-clear-objects COMMAND ${CMAKE_COMMAND} -E remove combine_tables1.h5 @@ -61,9 +61,9 @@ add_test ( test_table.h5 ) if (NOT "${last_test}" STREQUAL "") - set_tests_properties (hl_test-clear-objects PROPERTIES DEPENDS ${last_test}) + set_tests_properties (HL_test-clear-objects PROPERTIES DEPENDS ${last_test}) endif (NOT "${last_test}" STREQUAL "") -set (last_test "hl_test-clear-objects") +set (last_test "HL_test-clear-objects") HL_add_test (test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5") HL_add_test (test_dset_opt "") diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 5df258f..bb667b5 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -542,7 +542,6 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 814b351..5d68eeb 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -771,9 +771,9 @@ out: *------------------------------------------------------------------------- */ -static int read_data( const char* fname, /*IN*/ +static int read_data(const char* fname, /*IN*/ hsize_t *width, /*OUT*/ - hsize_t *height /*OUT*/ ) + hsize_t *height /*OUT*/) { int i, n; int color_planes; |