diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-03-05 23:27:03 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-03-05 23:27:03 (GMT) |
| commit | 4faf4d335b638215c2220564b894e909ff322ca8 (patch) | |
| tree | 26e482e760346eae24a298e42d2153a9c4200431 /java/test | |
| parent | 1e5b67c1dc8672206f2489854188f43a590aea14 (diff) | |
| parent | 3b0e80c1dcdf664f56829383aa3bc9e8ecc0f2c6 (diff) | |
| download | hdf5-4faf4d335b638215c2220564b894e909ff322ca8.zip hdf5-4faf4d335b638215c2220564b894e909ff322ca8.tar.gz hdf5-4faf4d335b638215c2220564b894e909ff322ca8.tar.bz2 | |
Merge branch 'develop' into hdffv_10354
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/test/TestH5Pfapl.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 49cda32..329c602 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.3.2) PROJECT (HDF5_JAVA_TEST Java) set (CMAKE_VERBOSE_MAKEFILE 1) diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 48a5986..51fa4df 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -26,6 +26,7 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; +import hdf.hdf5lib.exceptions.HDF5PropertyListInterfaceException; import hdf.hdf5lib.structs.H5AC_cache_config_t; import org.junit.After; @@ -1385,6 +1386,13 @@ public class TestH5Pfapl { ret_val_id = H5.H5Pget_evict_on_close(fapl_id); assertTrue("H5P_evict_on_close", ret_val_id); } + catch (HDF5PropertyListInterfaceException err) { + // parallel is not supported + if (err.getMinorErrorNumber() != HDF5Constants.H5E_CANTSET) { + err.printStackTrace(); + fail("H5P_evict_on_close: " + err); + } + } catch (Throwable err) { err.printStackTrace(); fail("H5P_evict_on_close: " + err); |