diff options
| -rw-r--r-- | c++/Makefile.am | 1 | ||||
| -rw-r--r-- | config/conclude.am | 29 | ||||
| -rw-r--r-- | fortran/Makefile.am | 1 | ||||
| -rw-r--r-- | fortran/src/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 5 |
5 files changed, 33 insertions, 7 deletions
diff --git a/c++/Makefile.am b/c++/Makefile.am index 0ff58ab..c6c94f3 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -26,6 +26,7 @@ endif ## Only recurse into subdirectories if C++ interface is enabled. if BUILD_CXX_CONDITIONAL SUBDIRS=src $(TEST_DIR) + endif DIST_SUBDIRS = src test examples diff --git a/config/conclude.am b/config/conclude.am index fe50318..fde966e 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -263,6 +263,35 @@ 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 + +# log VFD currently has file space allocation bugs +# VFD_LIST += log + +# The splitter VFD fails tests in this branch, but passes in develop. We +# can re-enable this when the issues have been corrected. +# VFD_LIST += splitter + +if DIRECT_VFD_CONDITIONAL + VFD_LIST += direct +endif +if BUILD_PARALLEL_CONDITIONAL + # MPI I/O VFD is currently incompatible with too many tests in the VFD test set + # VFD_LIST += mpio +endif +if MIRROR_VFD_CONDITIONAL + # Mirror VFD needs network configuration, etc. and isn't easy to set + # reasonable defaults for that info. + # VFD_LIST += mirror +endif +if ROS3_VFD_CONDITIONAL + VFD_LIST += ros3 +endif +# No HDFS conditional in this branch (yet) +#if HDFS_VFD_CONDITIONAL +# VFD_LIST += hdfs +#endif + # Run test with different Virtual File Driver check-vfd: $(LIB) $(PROGS) $(chk_TESTS) @for vfd in $(VFD_LIST) dummy; do \ diff --git a/fortran/Makefile.am b/fortran/Makefile.am index 99cf666..c17245d 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -36,6 +36,7 @@ endif ## Only recurse into subdirectories if HDF5 is configured to use Fortran. if BUILD_FORTRAN_CONDITIONAL SUBDIRS=src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) + endif # All directories that have Makefiles diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 8135926..13eeac7 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -40,8 +40,8 @@ else endif # Source files for the library. -libhdf5_fortran_la_SOURCES=H5f90global.F90 \ - H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \ +libhdf5_fortran_la_SOURCES=H5fortran_types.F90 H5f90global.F90 \ + H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \ H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90 \ H5Tff.F90 H5Zff.F90 H5_gen.F90 H5fortkit.F90 \ H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c \ diff --git a/test/Makefile.am b/test/Makefile.am index 60b9fd6..95d9e4f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -152,11 +152,6 @@ ttsafe_SOURCES=ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c \ cache_image_SOURCES=cache_image.c genall5.c mirror_vfd_SOURCES=mirror_vfd.c genall5.c -VFD_LIST = sec2 stdio core core_paged split multi family -if DIRECT_VFD_CONDITIONAL - VFD_LIST += direct -endif - # Additional target for running timing test timings _timings: testmeta @for timing in $(TIMINGS) dummy; do \ |