diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2020-12-12 15:25:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-12 15:25:54 (GMT) |
| commit | f6dce729e8cf3d6d8675fbbfe1d66ac044ba02fb (patch) | |
| tree | d1d10022b843a89da8c8c62ea97433009373eadd /java | |
| parent | 9e72b7f834eba0e7225bbec858da14431e0c6954 (diff) | |
| download | hdf5-f6dce729e8cf3d6d8675fbbfe1d66ac044ba02fb.zip hdf5-f6dce729e8cf3d6d8675fbbfe1d66ac044ba02fb.tar.gz hdf5-f6dce729e8cf3d6d8675fbbfe1d66ac044ba02fb.tar.bz2 | |
Moves the lists of VOL connectors and VFDs in Autotools builds (#162)
The VOL_LIST variable used in the Autotools was duplicated in many
subdirectories. It's been moved to config/conclude.am to avoid
duplication. VFD_LIST was also moved to conclude.am.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.am | 5 | ||||
| -rw-r--r-- | java/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/test/Makefile.am | 5 |
3 files changed, 3 insertions, 11 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 4426e3e..7063d13 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -39,11 +39,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/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index b0a0d53..66991c4 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -191,9 +191,11 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) vol_pass_through2 ) + # native VOL = 0 + # pass-through VOL = 1 set (vol_native native) set (vol_pass_through1 "pass_through under_vol=0\;under_info={}") - set (vol_pass_through2 "pass_through under_vol=505\;under_info={under_vol=0\;under_info={}}") + set (vol_pass_through2 "pass_through under_vol=1\;under_info={under_vol=0\;under_info={}}") foreach (voltest ${VOL_LIST}) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${voltest}") diff --git a/java/test/Makefile.am b/java/test/Makefile.am index 46e6a7e..a52bf2c 100644 --- a/java/test/Makefile.am +++ b/java/test/Makefile.am @@ -84,11 +84,6 @@ noinst_DATA = $(jarfile) .PHONY: classes -# 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={}}" - check_SCRIPTS = junit.sh TEST_SCRIPT = $(check_SCRIPTS) |