mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed extra-test libsrc4/tst_h_vl2 problem and valgrind test problems

Browse Source
This commit is contained in:
Ed Hartnett 2010-06-23 13:57:33 +00:00
parent 204685b257
commit f6447ee94c
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc4/Makefile.am
View File

@ -140,7 +140,7 @@ tst_h_atts3 tst_h_vars tst_h_vars2 tst_h_vars3 tst_h_grps \
tst_h_compounds tst_h_compounds2 tst_h_wrt_cmp tst_h_rd_cmp tst_h_vl \
tst_h_opaques tst_h_strings tst_h_strings1 tst_h_dimscales \
tst_h_dimscales1 tst_h_dimscales2 tst_h_dimscales3 tst_h_enums \
tst_h_vl2 tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars \
tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars \
tst_varms tst_unlim_vars tst_converts tst_converts2 tst_grps \
tst_compounds tst_compounds2 tst_compounds3 tst_opaques tst_strings \
tst_interops tst_interops4 tst_interops5 tst_enums tst_coords \
@ -163,10 +163,10 @@ tst_h_strings1 tst_h_dimscales tst_h_dimscales1 tst_h_dimscales2 \
tst_h_dimscales3 tst_h_enums tst_dims tst_dims2 tst_dims3 tst_files \
tst_files4 tst_vars tst_varms tst_unlim_vars tst_converts \
tst_converts2 tst_grps tst_compounds tst_compounds2 tst_compounds3 \
tst_h_vl2 tst_opaques tst_strings tst_interops tst_interops4 \
tst_interops5 tst_enums tst_vars3 tst_chunks tst_coords tst_coords2 \
tst_coords3 tst_utf8 tst_fills tst_fillbug tst_xplatform \
tst_xplatform2 tst_h_atts2 tst_endian_fill
tst_opaques tst_strings tst_interops tst_interops4 tst_interops5 \
tst_enums tst_vars3 tst_chunks tst_coords tst_coords2 tst_coords3 \
tst_utf8 tst_fills tst_fillbug tst_xplatform tst_xplatform2 \
tst_h_atts2 tst_endian_fill
EXTRA_DIST = ref_tst_compounds.nc ref_tst_h_compounds.h5 \
ref_tst_h_compounds2.h5 run_par_tests.sh run_valgrind_tests.sh \

4
nc_test4/Makefile.am
View File

@ -13,9 +13,9 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/liblib @EXTERN_CFLAGS@
# Unfortunately, libsrc4 contains nc_test.h
AM_CPPFLAGS += -I$(top_srcdir)/libsrc4 -I$(top_srcdir)/libsrc
# Our test programs and sources...
# Our test programs and sources. (tst_h_vl2 must come after tst_vl.)
NC4_TEST_PROGS = t_type cdm_sea_soundings tst_camrun tst_vl tst_atts \
tst_atts2 tst_vars2
tst_atts2 tst_vars2 tst_h_vl2
cdm_sea_soundings_SOURCES = cdm_sea_soundings.c tests.h
tst_camrun_SOURCES = tst_camrun.c tests.h
check_PROGRAMS = $(NC4_TEST_PROGS)

8
libsrc4/tst_h_vl2.c → nc_test4/tst_h_vl2.c
View File

@ -15,8 +15,7 @@ int
main()
{
printf("\n*** Checking HDF5 VLEN types even more.\n");
#ifdef EXTRA_TESTS
printf("*** Reading reference file...");
printf("*** Reading file created by netcdf-4 tests tst_vl...");
{
hid_t fileid, grpid, fapl_id, hdf_typeid = 0, base_hdf_typeid = 0, attid = 0;
hid_t file_typeid, spaceid, native_typeid;
@ -56,13 +55,10 @@ main()
switch (obj_class)
{
case H5O_TYPE_GROUP:
printf("group\n");
break;
case H5O_TYPE_DATASET:
printf("dataset\n");
break;
case H5O_TYPE_NAMED_DATATYPE:
printf("type\n");
if ((hdf_typeid = H5Topen2(grpid, obj_name, H5P_DEFAULT)) < 0) ERR_RET;
if ((class = H5Tget_class(hdf_typeid)) < 0) ERR_RET;
switch (class)
@ -128,7 +124,5 @@ main()
}
SUMMARIZE_ERR;
#endif
FINAL_RESULTS;
}