Merge pull request #909 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '032f680919cd67202c6b5817c327139c09dacb05':
  Add import
  Fix list var
  Fix IN_LIST usage
  Inc CMake min, Add new tests, rework test CMake files
  Update list

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);