summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-03-26 19:24:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-03-26 19:24:25 (GMT)
commiteafd204b2d53186c3adade5e1b5c984effa6b9ca (patch)
treec545f7a7486e2b887fa8cb6a9303aa63d8c6a112
parentc4ec20a6de26d3f748dc87d15226961983fc81c3 (diff)
downloadhdf5-eafd204b2d53186c3adade5e1b5c984effa6b9ca.zip
hdf5-eafd204b2d53186c3adade5e1b5c984effa6b9ca.tar.gz
hdf5-eafd204b2d53186c3adade5e1b5c984effa6b9ca.tar.bz2
[svn-r26607] Correct test of plugin read when disabled to not print FAILURE when successful
-rw-r--r--CMakeInstallation.cmake2
-rw-r--r--test/plugin.c17
2 files changed, 10 insertions, 9 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index e81d0a6..0380adc 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -389,7 +389,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
set (CPACK_BUNDLE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.icns")
set (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
set (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
- set (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2014 by The HDF Group. All rights reserved.")
+ set (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2015 by The HDF Group. All rights reserved.")
set (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
set (CPACK_APPLE_GUI_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
set (CPACK_APPLE_GUI_VERSION_STRING "${CPACK_PACKAGE_VERSION_STRING}")
diff --git a/test/plugin.c b/test/plugin.c
index 02007d5..74a8f4b 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -536,16 +536,17 @@ error:
*-------------------------------------------------------------------------
*/
static herr_t
-test_noread_data(hid_t dataset, int *origin_data)
+test_noread_data(hid_t dataset)
{
- int check[DSET_DIM1][DSET_DIM2];
- const hsize_t size[2] = {DSET_DIM1, DSET_DIM2}; /* Dataspace dimensions */
- int *data_p = origin_data;
- size_t i, j; /* Local index variables */
+ int check[DSET_DIM1][DSET_DIM2];
+ herr_t ret;
/* Read the dataset back */
- if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check) >= 0)
- TEST_ERROR;
+ H5E_BEGIN_TRY {
+ ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check);
+ } H5E_END_TRY
+ if(ret >= 0)
+ TEST_ERROR
PASSED();
return 0;
@@ -578,7 +579,7 @@ test_noread_with_filters(hid_t file)
if((dset = H5Dopen2(file,DSET_DYNLIB1_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
- if(test_noread_data(dset, (int *)points_dynlib1) < 0) TEST_ERROR
+ if(test_noread_data(dset) < 0) TEST_ERROR
if(H5Dclose(dset) < 0) TEST_ERROR