diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-04-01 21:04:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-04-01 21:04:06 (GMT) |
| commit | ad4154cdc89ddf15691dbfe1c609898ef484808b (patch) | |
| tree | 19a59cc99175477756b58395d6d57aba7d2687f0 /test | |
| parent | 025d90f57313002ddb6ac24dcb034baed1f39012 (diff) | |
| download | hdf5-ad4154cdc89ddf15691dbfe1c609898ef484808b.zip hdf5-ad4154cdc89ddf15691dbfe1c609898ef484808b.tar.gz hdf5-ad4154cdc89ddf15691dbfe1c609898ef484808b.tar.bz2 | |
[svn-r26700] Generators are only built static
Plugin test for disable state does not print error stack and does not print FAILED
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | test/plugin.c | 17 |
3 files changed, 13 insertions, 12 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c949560..c402324 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -296,8 +296,8 @@ endif (\${TEST_RESULT} STREQUAL \"0\") ############################################################################## if (BUILD_SHARED_LIBS) add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c) - TARGET_NAMING (plugin ${LIB_TYPE}) - TARGET_C_PROPERTIES (plugin ${LIB_TYPE} " " " ") + TARGET_NAMING (plugin SHARED) + TARGET_C_PROPERTIES (plugin SHARED " " " ") target_link_libraries (plugin ${HDF5_TEST_PLUGIN_LIB_TARGET}) set_target_properties (plugin PROPERTIES FOLDER test) endif (BUILD_SHARED_LIBS) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index e50b22c..5087290 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -668,8 +668,8 @@ endif (HDF5_TEST_VFD) if (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS) MACRO (ADD_H5_GENERATOR genfile) add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c) - TARGET_NAMING (${genfile} ${LIB_TYPE}) - TARGET_C_PROPERTIES (${genfile} " " " ") + TARGET_NAMING (${genfile} STATIC) + TARGET_C_PROPERTIES (${genfile} STATIC " " " ") target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (${genfile} PROPERTIES FOLDER generator/test) ENDMACRO (ADD_H5_GENERATOR genfile) 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 |