diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | c++/Makefile.am | 5 | ||||
| -rw-r--r-- | config/conclude.am | 13 | ||||
| -rw-r--r-- | fortran/Makefile.am | 5 | ||||
| -rw-r--r-- | hl/Makefile.am | 5 | ||||
| -rw-r--r-- | java/Makefile.am | 6 | ||||
| -rw-r--r-- | src/H5VLpassthru.h | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 11 | ||||
| -rw-r--r-- | testpar/Makefile.am | 5 |
9 files changed, 18 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index 975f276..794007c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,10 +190,10 @@ trace: # Run tests with different Virtual File Drivers. # Currently, only invoke check-vfd in the test directory. check-vfd: - for d in src utils test; do \ - if test $$d != .; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ + for d in src utils test; do \ + if test $$d != .; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ done # Run tests with different passthrough Virtual Object Layer Connectors. diff --git a/c++/Makefile.am b/c++/Makefile.am index 5d8258b..6a91464 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -28,11 +28,6 @@ endif if BUILD_CXX_CONDITIONAL SUBDIRS=src $(TEST_DIR) -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - endif DIST_SUBDIRS = src test examples diff --git a/config/conclude.am b/config/conclude.am index 9b2298c..7d19082 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -270,6 +270,11 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS) echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\ fi +VFD_LIST = sec2 stdio core core_paged split multi family +if DIRECT_VFD_CONDITIONAL + VFD_LIST += direct +endif + # Run test with different Virtual File Driver check-vfd: $(LIB) $(PROGS) $(chk_TESTS) @for vfd in $(VFD_LIST) dummy; do \ @@ -282,6 +287,14 @@ check-vfd: $(LIB) $(PROGS) $(chk_TESTS) fi; \ done +# Test with just the native connector, with a single pass-through connector +# and with a doubly-stacked pass-through. +# +# native = 0 +# pass-through = 1 +VOL_LIST = native "pass_through under_vol=0;under_info={}" \ + "pass_through under_vol=1;under_info={under_vol=0;under_info={}}" + # Run test with different passthrough Virtual Object Layer Connector # NOTE: Will only succeed with passthrough VOL connectors that use # the native VOL connector as the terminal connector. diff --git a/fortran/Makefile.am b/fortran/Makefile.am index e48aafe..5b29216 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -38,11 +38,6 @@ endif if BUILD_FORTRAN_CONDITIONAL SUBDIRS=src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - endif # All directories that have Makefiles diff --git a/hl/Makefile.am b/hl/Makefile.am index 80ef66a..9bf209e 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -47,11 +47,6 @@ endif if BUILD_HDF5_HL_CONDITIONAL SUBDIRS=src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR) -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - endif DIST_SUBDIRS=src test tools c++ fortran examples diff --git a/java/Makefile.am b/java/Makefile.am index abc7f1d..bb8b426 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,6 +1,5 @@ # # Copyright by The HDF Group. -# Copyright by the Board of Trustees of the University of Illinois. # All rights reserved. # # This file is part of HDF5. The full HDF5 copyright notice, including @@ -39,11 +38,6 @@ JAVA_API=yes SUBDIRS=src $(TESTSERIAL_DIR) $(TESTEXAMPLES_DIR) -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - endif include $(top_srcdir)/config/conclude.am diff --git a/src/H5VLpassthru.h b/src/H5VLpassthru.h index 79caca7..ec396cc 100644 --- a/src/H5VLpassthru.h +++ b/src/H5VLpassthru.h @@ -25,7 +25,7 @@ /* Characteristics of the pass-through VOL connector */ #define H5VL_PASSTHRU_NAME "pass_through" -#define H5VL_PASSTHRU_VALUE 505 /* VOL connector ID */ +#define H5VL_PASSTHRU_VALUE 1 /* VOL connector ID */ #define H5VL_PASSTHRU_VERSION 0 /* Pass-through VOL connector info */ diff --git a/test/Makefile.am b/test/Makefile.am index 566eec0..092645f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -173,16 +173,6 @@ vfd_swmr_zoo_reader_SOURCES=vfd_swmr_zoo_writer.c genall5.c vfd_swmr_bigset_reader_SOURCES=vfd_swmr_bigset_writer.c vfd_swmr_group_reader_SOURCES=vfd_swmr_group_writer.c -VFD_LIST = sec2 stdio core core_paged split multi family -if DIRECT_VFD_CONDITIONAL - VFD_LIST += direct -endif - -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - # Additional target for running timing test timings _timings: testmeta @for timing in $(TIMINGS) dummy; do \ @@ -192,7 +182,6 @@ timings _timings: testmeta fi; \ done; - # The flush1 test must run before the flush2 test flush2.chkexe_: flush1.chkexe_ diff --git a/testpar/Makefile.am b/testpar/Makefile.am index eeea2f5..6a8cc2b 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -42,11 +42,6 @@ testphdf5_SOURCES=testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \ # The tests all depend on the hdf5 library and the test library LDADD = $(LIBH5TEST) $(LIBHDF5) -# Test with just the native connector, with a single pass-through connector -# and with a doubly-stacked pass-through. -VOL_LIST = native "pass_through under_vol=0;under_info={}" \ - "pass_through under_vol=505;under_info={under_vol=0;under_info={}}" - # Temporary files # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf |