From 05e7daf40b69498d77dba0a15a92ec51311f20b5 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 21 Oct 2021 12:29:35 -0500 Subject: Adjust CMake and Java for new API H5VLfapl_is_native --- CMakeLists.txt | 125 +++++++++++++++++----------------- MANIFEST | 5 +- config/commence.am | 1 - java/src/hdf/hdf5lib/H5.java | 30 +++++--- java/src/jni/CMakeLists.txt | 22 ------ java/src/jni/Makefile.am | 13 +--- java/src/jni/h5jni_test.c | 53 -------------- java/src/jni/h5jni_test.h | 34 --------- java/src/jni/h5vlImp.c | 21 ++++++ java/src/jni/h5vlImp.h | 7 ++ java/test/CMakeLists.txt | 20 +----- java/test/H5TestUtils.java | 77 --------------------- java/test/Makefile.am | 3 +- java/test/TestH5.java | 2 - java/test/TestH5A.java | 2 - java/test/TestH5Arw.java | 2 - java/test/TestH5D.java | 2 - java/test/TestH5Dparams.java | 1 - java/test/TestH5Dplist.java | 2 - java/test/TestH5Drw.java | 2 - java/test/TestH5E.java | 2 - java/test/TestH5Edefault.java | 1 - java/test/TestH5Eparams.java | 2 - java/test/TestH5Eregister.java | 1 - java/test/TestH5F.java | 2 - java/test/TestH5Fbasic.java | 2 - java/test/TestH5Fparams.java | 2 - java/test/TestH5Fswmr.java | 2 - java/test/TestH5G.java | 2 - java/test/TestH5Gbasic.java | 2 - java/test/TestH5Giterate.java | 1 - java/test/TestH5Lbasic.java | 2 - java/test/TestH5Lcreate.java | 2 - java/test/TestH5Lparams.java | 2 - java/test/TestH5Obasic.java | 2 - java/test/TestH5Ocopy.java | 2 - java/test/TestH5Ocreate.java | 4 +- java/test/TestH5Oparams.java | 1 - java/test/TestH5P.java | 2 - java/test/TestH5PData.java | 2 - java/test/TestH5PL.java | 1 - java/test/TestH5Pfapl.java | 2 - java/test/TestH5Pfaplhdfs.java | 2 - java/test/TestH5Pfapls3.java | 2 - java/test/TestH5Plist.java | 1 - java/test/TestH5Pvirtual.java | 2 - java/test/TestH5R.java | 2 - java/test/TestH5Rref.java | 2 - java/test/TestH5S.java | 1 - java/test/TestH5Sbasic.java | 1 - java/test/TestH5T.java | 2 - java/test/TestH5Tbasic.java | 1 - java/test/TestH5Tparams.java | 1 - java/test/TestH5VL.java | 3 +- java/test/TestH5Z.java | 1 - java/test/junit.sh.in | 13 +--- tools/test/h5diff/testh5diff.sh.in | 30 +------- tools/test/h5dump/CMakeVFDTests.cmake | 2 +- tools/test/h5dump/testh5dumpvds.sh.in | 19 +----- tools/test/h5ls/testh5ls.sh.in | 14 +--- tools/test/h5ls/testh5lsvds.sh.in | 8 +-- tools/test/h5repack/h5repack.sh.in | 11 +-- 62 files changed, 124 insertions(+), 459 deletions(-) delete mode 100644 java/src/jni/h5jni_test.c delete mode 100644 java/src/jni/h5jni_test.h delete mode 100644 java/test/H5TestUtils.java diff --git a/CMakeLists.txt b/CMakeLists.txt index 2769817..3c6df76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,78 +137,75 @@ mark_as_advanced (ALLOW_UNSUPPORTED) #----------------------------------------------------------------------------- # Set the core names of all the libraries #----------------------------------------------------------------------------- -set (HDF5_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}") -set (HDF5_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test") -set (HDF5_CPP_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_cpp") -set (HDF5_HL_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl") -set (HDF5_HL_CPP_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_cpp") -set (HDF5_TOOLS_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_tools") -set (HDF5_UTILS_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_utils") -set (HDF5_F90_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_fortran") -set (HDF5_F90_C_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_f90cstub") -set (HDF5_F90_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test_fortran") -set (HDF5_F90_C_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test_f90cstub") -set (HDF5_HL_F90_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_fortran") -set (HDF5_HL_F90_C_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_f90cstub") -set (HDF5_JAVA_JNI_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_java") -set (HDF5_JAVA_JNI_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_java_test") -set (HDF5_JAVA_HDF5_LIB_CORENAME "jarhdf5") -set (HDF5_JAVA_TEST_LIB_CORENAME "jartest5") +set (HDF5_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}") +set (HDF5_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test") +set (HDF5_CPP_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_cpp") +set (HDF5_HL_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl") +set (HDF5_HL_CPP_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_cpp") +set (HDF5_TOOLS_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_tools") +set (HDF5_UTILS_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_utils") +set (HDF5_F90_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_fortran") +set (HDF5_F90_C_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_f90cstub") +set (HDF5_F90_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test_fortran") +set (HDF5_F90_C_TEST_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_test_f90cstub") +set (HDF5_HL_F90_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_fortran") +set (HDF5_HL_F90_C_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_hl_f90cstub") +set (HDF5_JAVA_JNI_LIB_CORENAME "hdf5${HDF5_LIB_INFIX}_java") +set (HDF5_JAVA_HDF5_LIB_CORENAME "jarhdf5") +set (HDF5_JAVA_TEST_LIB_CORENAME "jartest5") #----------------------------------------------------------------------------- # Set the true names of all the libraries if customized by external project #----------------------------------------------------------------------------- -set (HDF5_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_CORENAME}") -set (HDF5_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_LIB_CORENAME}") -set (HDF5_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_CPP_LIB_CORENAME}") -set (HDF5_HL_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_LIB_CORENAME}") -set (HDF5_HL_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_CPP_LIB_CORENAME}") -set (HDF5_TOOLS_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOLS_LIB_CORENAME}") -set (HDF5_UTILS_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_UTILS_LIB_CORENAME}") -set (HDF5_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_LIB_CORENAME}") -set (HDF5_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_LIB_CORENAME}") -set (HDF5_F90_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_TEST_LIB_CORENAME}") -set (HDF5_F90_C_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_TEST_LIB_CORENAME}") -set (HDF5_HL_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_LIB_CORENAME}") -set (HDF5_HL_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_CORENAME}") -set (HDF5_JAVA_JNI_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_JNI_LIB_CORENAME}") -set (HDF5_JAVA_JNI_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_JNI_TEST_LIB_CORENAME}") -set (HDF5_JAVA_HDF5_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_HDF5_LIB_CORENAME}") -set (HDF5_JAVA_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_TEST_LIB_CORENAME}") +set (HDF5_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_CORENAME}") +set (HDF5_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_LIB_CORENAME}") +set (HDF5_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_CPP_LIB_CORENAME}") +set (HDF5_HL_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_LIB_CORENAME}") +set (HDF5_HL_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_CPP_LIB_CORENAME}") +set (HDF5_TOOLS_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOLS_LIB_CORENAME}") +set (HDF5_UTILS_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_UTILS_LIB_CORENAME}") +set (HDF5_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_LIB_CORENAME}") +set (HDF5_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_LIB_CORENAME}") +set (HDF5_F90_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_TEST_LIB_CORENAME}") +set (HDF5_F90_C_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_TEST_LIB_CORENAME}") +set (HDF5_HL_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_LIB_CORENAME}") +set (HDF5_HL_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_CORENAME}") +set (HDF5_JAVA_JNI_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_JNI_LIB_CORENAME}") +set (HDF5_JAVA_HDF5_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_HDF5_LIB_CORENAME}") +set (HDF5_JAVA_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_TEST_LIB_CORENAME}") #----------------------------------------------------------------------------- # Set the target names of all the libraries #----------------------------------------------------------------------------- -set (HDF5_LIB_TARGET "${HDF5_LIB_CORENAME}-static") -set (HDF5_TEST_LIB_TARGET "${HDF5_TEST_LIB_CORENAME}-static") -set (HDF5_CPP_LIB_TARGET "${HDF5_CPP_LIB_CORENAME}-static") -set (HDF5_HL_LIB_TARGET "${HDF5_HL_LIB_CORENAME}-static") -set (HDF5_HL_CPP_LIB_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-static") -set (HDF5_TOOLS_LIB_TARGET "${HDF5_TOOLS_LIB_CORENAME}-static") -set (HDF5_UTILS_LIB_TARGET "${HDF5_UTILS_LIB_CORENAME}-static") -set (HDF5_F90_LIB_TARGET "${HDF5_F90_LIB_CORENAME}-static") -set (HDF5_F90_C_LIB_TARGET "${HDF5_F90_C_LIB_CORENAME}-static") -set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-static") -set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static") -set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static") -set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static") -set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") -set (HDF5_JAVA_JNI_TEST_LIB_TARGET "${HDF5_JAVA_JNI_TEST_LIB_CORENAME}") -set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") -set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") -set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") -set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") -set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") -set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") -set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") -set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") -set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}-shared") -set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}-shared") -set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") -set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") -set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-shared") -set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}-shared") -set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared") +set (HDF5_LIB_TARGET "${HDF5_LIB_CORENAME}-static") +set (HDF5_TEST_LIB_TARGET "${HDF5_TEST_LIB_CORENAME}-static") +set (HDF5_CPP_LIB_TARGET "${HDF5_CPP_LIB_CORENAME}-static") +set (HDF5_HL_LIB_TARGET "${HDF5_HL_LIB_CORENAME}-static") +set (HDF5_HL_CPP_LIB_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-static") +set (HDF5_TOOLS_LIB_TARGET "${HDF5_TOOLS_LIB_CORENAME}-static") +set (HDF5_UTILS_LIB_TARGET "${HDF5_UTILS_LIB_CORENAME}-static") +set (HDF5_F90_LIB_TARGET "${HDF5_F90_LIB_CORENAME}-static") +set (HDF5_F90_C_LIB_TARGET "${HDF5_F90_C_LIB_CORENAME}-static") +set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-static") +set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static") +set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static") +set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static") +set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") +set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") +set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") +set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") +set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") +set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") +set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") +set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") +set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") +set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}-shared") +set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}-shared") +set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") +set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") +set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-shared") +set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}-shared") +set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared") #----------------------------------------------------------------------------- # Define some CMake variables for use later in the project diff --git a/MANIFEST b/MANIFEST index b586970..2cdeb24 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3197,8 +3197,6 @@ ./java/src/jni/nativeData.c ./java/src/jni/nativeData.h ./java/src/jni/h5jni.h -./java/src/jni/h5jni_test.c -./java/src/jni/h5jni_test.h ./java/src/jni/h5util.c ./java/src/jni/h5util.h ./java/src/jni/h5Imp.c @@ -3507,7 +3505,6 @@ ./java/test/testfiles/JUnit-TestH5VL.txt ./java/test/testfiles/JUnit-TestH5Z.txt ./java/test/h5ex_g_iterate.orig -./java/test/TestAll.java ./java/test/TestH5.java ./java/test/TestH5A.java ./java/test/TestH5Arw.java @@ -3550,7 +3547,7 @@ ./java/test/TestH5T.java ./java/test/TestH5VL.java ./java/test/TestH5Z.java -./java/test/H5TestUtils.java +./java/test/TestAll.java ./java/lib/hamcrest-core.jar ./java/lib/junit.jar diff --git a/config/commence.am b/config/commence.am index d0b042f..3fddc6a 100644 --- a/config/commence.am +++ b/config/commence.am @@ -36,7 +36,6 @@ LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la LIBH5JNI=$(top_builddir)/java/src/jni/libhdf5_java.la -LIBH5JNITEST=$(top_builddir)/java/src/jni/libhdf5_java_test.la LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 2c89f3a..5380bd1 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -13492,7 +13492,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native long H5VLregister_connector_by_name(String connector_name, long vipl_id); + public synchronized static native long H5VLregister_connector_by_name(String connector_name, long vipl_id) throws HDF5LibraryException; /** * H5VLregister_connector_by_value registers a new VOL connector as a member of the virtual object layer class. * @@ -13507,7 +13507,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native long H5VLregister_connector_by_value(int connector_value, long vipl_id); + public synchronized static native long H5VLregister_connector_by_value(int connector_value, long vipl_id) throws HDF5LibraryException; /** * H5VLis_connector_registered_by_name tests whether a VOL class has been registered. * @@ -13519,7 +13519,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native boolean H5VLis_connector_registered_by_name(String name); + public synchronized static native boolean H5VLis_connector_registered_by_name(String name) throws HDF5LibraryException; /** * H5VLis_connector_registered_by_value tests whether a VOL class has been registered. * @@ -13531,7 +13531,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native boolean H5VLis_connector_registered_by_value(int connector_value); + public synchronized static native boolean H5VLis_connector_registered_by_value(int connector_value) throws HDF5LibraryException; /** * H5VLget_connector_id retrieves the ID for a registered VOL connector for a given object. * @@ -13543,7 +13543,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native long H5VLget_connector_id(long object_id); + public synchronized static native long H5VLget_connector_id(long object_id) throws HDF5LibraryException; /** * H5VLget_connector_id_by_name retrieves the ID for a registered VOL connector. * @@ -13555,7 +13555,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native long H5VLget_connector_id_by_name(String name); + public synchronized static native long H5VLget_connector_id_by_name(String name) throws HDF5LibraryException; /** * H5VLget_connector_id_by_value retrieves the ID for a registered VOL connector. * @@ -13567,7 +13567,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native long H5VLget_connector_id_by_value(int connector_value); + public synchronized static native long H5VLget_connector_id_by_value(int connector_value) throws HDF5LibraryException; /** * H5VLget_connector_name returns the connector name for the VOL associated with the * object or file ID. @@ -13580,7 +13580,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native String H5VLget_connector_name(long object_id); + public synchronized static native String H5VLget_connector_name(long object_id) throws HDF5LibraryException; /** * H5VLclose closes a VOL connector ID. * @@ -13590,7 +13590,7 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native void H5VLclose(long connector_id); + public synchronized static native void H5VLclose(long connector_id) throws HDF5LibraryException; /** * H5VLunregister_connector removes a VOL connector ID from the library. * @@ -13600,7 +13600,17 @@ public class H5 implements java.io.Serializable { * @exception HDF5LibraryException * - Error from the HDF-5 Library. **/ - public synchronized static native void H5VLunregister_connector(long connector_id); + public synchronized static native void H5VLunregister_connector(long connector_id) throws HDF5LibraryException; + + /** + * H5VLfapl_is_native queries if a FAPL will use the native VOL connector. + * + * @param fapl_id + * The ID of the FAPL to query. + * @return true if fapl_id uses the native VOL connector. + * + **/ + public synchronized static native boolean H5VLfapl_is_native(long fapl_id) throws HDF5LibraryException; // /////// unimplemented //////// // hid_t H5VLregister_connector(const H5VL_class_t *cls, hid_t vipl_id); diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 8e8d9d6..ab306ef 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -73,17 +73,6 @@ set (HDF5_JAVA_JNI_CHDRS ${HDF5_JAVA_JNI_SOURCE_DIR}/nativeData.h ) -set (HDF5_JAVA_TEST_CSRCS - ${HDF5_JAVA_JNI_SOURCE_DIR}/exceptionImp.c - ${HDF5_JAVA_JNI_SOURCE_DIR}/h5jni_test.c -) - -set (HDF5_JAVA_TEST_CHDRS - ${HDF5_JAVA_JNI_SOURCE_DIR}/exceptionImp.h - ${HDF5_JAVA_JNI_SOURCE_DIR}/h5jni.h - ${HDF5_JAVA_JNI_SOURCE_DIR}/h5jni_test.h -) - set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) ########### JNI libraries always must be built shared ############### @@ -98,17 +87,6 @@ set_target_properties (${HDF5_JAVA_JNI_LIB_TARGET} PROPERTIES FOLDER libraries/j SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_JAVA_JNI_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED "JAVA") -# Build Testing library -add_library (${HDF5_JAVA_JNI_TEST_LIB_TARGET} SHARED ${HDF5_JAVA_TEST_CSRCS} ${HDF5_JAVA_TEST_CHDRS}) -target_include_directories (${HDF5_JAVA_JNI_TEST_LIB_TARGET} - PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$:${MPI_C_INCLUDE_DIRS}>" -) -target_compile_options(${HDF5_JAVA_JNI_TEST_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") -TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_TEST_LIB_TARGET} SHARED) -target_link_libraries (${HDF5_JAVA_JNI_TEST_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) -set_target_properties (${HDF5_JAVA_JNI_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/jni) -H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_TEST_LIB_TARGET} ${HDF5_JAVA_JNI_TEST_LIB_NAME} SHARED "JAVA") - #----------------------------------------------------------------------------- # Add Target to clang-format #----------------------------------------------------------------------------- diff --git a/java/src/jni/Makefile.am b/java/src/jni/Makefile.am index d17d3d1..bf086d2 100644 --- a/java/src/jni/Makefile.am +++ b/java/src/jni/Makefile.am @@ -25,15 +25,12 @@ JAVA_API=yes AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/java/src/jni $(JNIFLAGS) # This is our main target -lib_LTLIBRARIES=libhdf5_java.la libhdf5_java_test.la +lib_LTLIBRARIES=libhdf5_java.la # Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am) libhdf5_java_la_LDFLAGS = -avoid-version -shared -export-dynamic -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS) -# Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am) -libhdf5_java_test_la_LDFLAGS = -avoid-version -shared -export-dynamic -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS) - -# Source files for the main Java library +# Source files for the library libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \ h5aImp.c h5dImp.c h5eImp.c h5fImp.c h5gImp.c h5iImp.c h5lImp.c h5oImp.c \ h5pImp.c h5pACPLImp.c h5pDAPLImp.c h5pDCPLImp.c h5pDXPLImp.c \ @@ -41,13 +38,7 @@ libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp h5pOCPLImp.c h5pOCpyPLImp.c h5pStrCPLImp.c h5plImp.c h5rImp.c h5sImp.c h5tImp.c \ h5vlImp.c h5zImp.c -# Source files for the Java testing library -libhdf5_java_test_la_SOURCES=h5jni_test.c - # HDF5 Java (JNI) library depends on HDF5 Library. libhdf5_java_la_LIBADD=$(LIBHDF5) -# HDF5 Java (JNI) Testing library depends on HDF5 Library and Java Library. -libhdf5_java_test_la_LIBADD=$(LIBHDF5) libhdf5_java.la - include $(top_srcdir)/config/conclude.am diff --git a/java/src/jni/h5jni_test.c b/java/src/jni/h5jni_test.c deleted file mode 100644 index 9374f8d..0000000 --- a/java/src/jni/h5jni_test.c +++ /dev/null @@ -1,53 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://www.hdfgroup.org/licenses. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * For details of the HDF libraries, see the HDF Documentation at: - * http://hdfgroup.org/HDF5/doc/ - * - */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include -#include -#include "hdf5.h" -#include "H5VLprivate.h" -#include "h5jni.h" -#include "h5jni_test.h" - -/* - * Class: test_H5TestUtils - * Method: H5VLfapl_is_native - * Signature: (J)Z - */ -JNIEXPORT jboolean JNICALL -Java_test_H5TestUtils_H5VLfapl_1is_1native(JNIEnv *env, jclass clss, jlong fapl_id) -{ - hbool_t bval = JNI_FALSE; - - UNUSED(clss); - - if (H5VLfapl_is_native((hid_t)fapl_id, &bval) < 0) - H5_LIBRARY_ERROR(ENVONLY); - - bval = (bval > 0) ? JNI_TRUE : JNI_FALSE; - -done: - return (jboolean)bval; -} - -#ifdef __cplusplus -} /* end extern "C" */ -#endif /* __cplusplus */ diff --git a/java/src/jni/h5jni_test.h b/java/src/jni/h5jni_test.h deleted file mode 100644 index 9f1968b..0000000 --- a/java/src/jni/h5jni_test.h +++ /dev/null @@ -1,34 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://www.hdfgroup.org/licenses. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include -/* Header for HDF5 JNI test routines */ - -#ifndef Included_h5jni_test -#define Included_h5jni_test - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* - * Class: test_H5TestUtils - * Method: H5VLfapl_is_native - * Signature: (J)Z - */ -JNIEXPORT jboolean JNICALL Java_test_H5TestUtils_H5VLfapl_1is_1native(JNIEnv *, jclass, jlong); - -#ifdef __cplusplus -} /* end extern "C" */ -#endif /* __cplusplus */ - -#endif /* Included_h5jni_test */ diff --git a/java/src/jni/h5vlImp.c b/java/src/jni/h5vlImp.c index 40f8863..ae56e56 100644 --- a/java/src/jni/h5vlImp.c +++ b/java/src/jni/h5vlImp.c @@ -278,6 +278,27 @@ done: return; } /* end Java_hdf_hdf5lib_H5_H5VLunregister_1connector */ +/* + * Class: hdf_hdf5lib_H5 + * Method: H5VLfapl_is_native + * Signature: (J)Z + */ +JNIEXPORT jboolean JNICALL +Java_hdf_hdf5lib_H5_H5VLfapl_1is_1native(JNIEnv *env, jclass clss, jlong fapl_id) +{ + hbool_t bval = JNI_FALSE; + + UNUSED(clss); + + if (H5VLfapl_is_native((hid_t)fapl_id, &bval) < 0) + H5_LIBRARY_ERROR(ENVONLY); + + bval = (bval > 0) ? JNI_TRUE : JNI_FALSE; + +done: + return (jboolean)bval; +} + #ifdef __cplusplus } /* end extern "C" */ #endif /* __cplusplus */ diff --git a/java/src/jni/h5vlImp.h b/java/src/jni/h5vlImp.h index a17807f..0cc3366 100644 --- a/java/src/jni/h5vlImp.h +++ b/java/src/jni/h5vlImp.h @@ -93,6 +93,13 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5VLclose(JNIEnv *, jclass, jlong); */ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5VLunregister_1connector(JNIEnv *, jclass, jlong); +/* + * Class: hdf_hdf5lib_H5 + * Method: H5VLfapl_is_native + * Signature: (J)Z + */ +JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5VLfapl_1is_1native(JNIEnv *, jclass, jlong); + #ifdef __cplusplus } /* end extern "C" */ #endif /* __cplusplus */ diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 44c95cb..ffaf5f5 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -5,10 +5,6 @@ set (CMAKE_VERBOSE_MAKEFILE 1) set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_JAVA_JNI_BINARY_DIR};${HDF5_JAVA_HDF5_LIB_DIR}") -set (HDF5_JAVA_TEST_JAR_SOURCES - H5TestUtils.java -) - set (HDF5_JAVA_TEST_SOURCES TestH5 TestH5Eparams @@ -72,19 +68,7 @@ if (HDF5_ENABLE_HDFS) ) endif () -set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR};${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}") - -file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt -" -" -) - -# Build Testing JAR -add_jar (${HDF5_JAVA_TEST_LIB_TARGET} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_TEST_JAR_SOURCES}) -add_dependencies (${HDF5_JAVA_TEST_LIB_TARGET} ${HDF5_JAVA_HDF5_LIB_TARGET}) -get_target_property (${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE ${HDF5_JAVA_TEST_LIB_TARGET} JAR_FILE) - -set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH};${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}") +set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}") foreach (test_file ${HDF5_JAVA_TEST_SOURCES}) @@ -100,7 +84,6 @@ foreach (test_file ${HDF5_JAVA_TEST_SOURCES}) #get_target_property (${HDF5_JAVA_TEST_LIB_TARGET}_${test_file}_CLASSPATH ${HDF5_JAVA_TEST_LIB_TARGET}_${test_file} CLASSDIR) add_dependencies (${HDF5_JAVA_TEST_LIB_TARGET}_${test_file} ${HDF5_JAVA_HDF5_LIB_TARGET}) - add_dependencies (${HDF5_JAVA_TEST_LIB_TARGET}_${test_file} ${HDF5_JAVA_TEST_LIB_TARGET}) set_target_properties (${HDF5_JAVA_TEST_LIB_TARGET}_${test_file} PROPERTIES FOLDER test/java) endforeach () @@ -137,7 +120,6 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH}) set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}") endforeach () - set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}") set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_${test_file}_JAR_FILE}") add_test ( diff --git a/java/test/H5TestUtils.java b/java/test/H5TestUtils.java deleted file mode 100644 index c96e856..0000000 --- a/java/test/H5TestUtils.java +++ /dev/null @@ -1,77 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://www.hdfgroup.org/licenses. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -package test; - -import hdf.hdf5lib.H5; -import hdf.hdf5lib.HDF5Constants; -import hdf.hdf5lib.exceptions.HDF5Exception; -import hdf.hdf5lib.exceptions.HDF5JavaException; -import hdf.hdf5lib.exceptions.HDF5LibraryException; - -/** - * This class contains testing routines for the Java interface which are - * public, but are not meant for general use. - **/ -public class H5TestUtils { - - private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(H5TestUtils.class); - - private static boolean isLibraryLoaded = false; - - static { - loadH5TestLib(); - } - - /** - * load native testing library - */ - public static void loadH5TestLib() { - String s_libraryName = null; - String mappedName = null; - - // Make sure that the library is loaded only once - if (isLibraryLoaded) - return; - - try { - s_libraryName = "hdf5_java_test"; - mappedName = System.mapLibraryName(s_libraryName); - System.loadLibrary("hdf5_java_test"); - isLibraryLoaded = true; - } - catch (Throwable err) { - err.printStackTrace(); - isLibraryLoaded = false; - } - finally { - log.info("HDF5 Java test library: " + s_libraryName); - log.debug(" resolved to: " + mappedName + "; "); - log.info((isLibraryLoaded ? "" : " NOT") + " successfully loaded from java.library.path"); - } - - /* Important! Disable error output to C stdout */ - if (!log.isDebugEnabled()) - H5.H5error_off(); - } - - /** - * H5VLfapl_is_native queries if a FAPL will use the native VOL connector. - * - * @param fapl_id - * The ID of the FAPL to query. - * @return true if fapl_id uses the native VOL connector. - * - **/ - public synchronized static native boolean H5VLfapl_is_native(long fapl_id) throws HDF5LibraryException; - -} diff --git a/java/test/Makefile.am b/java/test/Makefile.am index b69e019..ac3b619 100644 --- a/java/test/Makefile.am +++ b/java/test/Makefile.am @@ -36,8 +36,7 @@ AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation TESTPACKAGE = noinst_JAVA = \ - H5TestUtils.java \ - TestH5.java \ + TestH5.java \ TestH5Eparams.java \ TestH5Eregister.java \ TestH5Fparams.java \ diff --git a/java/test/TestH5.java b/java/test/TestH5.java index a5d0063..1f298f3 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -34,8 +34,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5A.java b/java/test/TestH5A.java index 77652e3..f2134d2 100644 --- a/java/test/TestH5A.java +++ b/java/test/TestH5A.java @@ -30,8 +30,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5A_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Arw.java b/java/test/TestH5Arw.java index a144ab7..8ce2fee 100644 --- a/java/test/TestH5Arw.java +++ b/java/test/TestH5Arw.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.callbacks.H5A_iterate_t; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5D.java b/java/test/TestH5D.java index 8b34516..dac3a9c 100644 --- a/java/test/TestH5D.java +++ b/java/test/TestH5D.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.callbacks.H5D_iterate_t; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Dparams.java b/java/test/TestH5Dparams.java index 91a2d33..3661139 100644 --- a/java/test/TestH5Dparams.java +++ b/java/test/TestH5Dparams.java @@ -15,7 +15,6 @@ package test; import static org.junit.Assert.assertTrue; import hdf.hdf5lib.H5; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Dplist.java b/java/test/TestH5Dplist.java index cfd9661..774b9dd 100644 --- a/java/test/TestH5Dplist.java +++ b/java/test/TestH5Dplist.java @@ -23,8 +23,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Drw.java b/java/test/TestH5Drw.java index 782245f..69fb9d7 100644 --- a/java/test/TestH5Drw.java +++ b/java/test/TestH5Drw.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.callbacks.H5D_iterate_t; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5E.java b/java/test/TestH5E.java index d4a9c82..cad0a06 100644 --- a/java/test/TestH5E.java +++ b/java/test/TestH5E.java @@ -27,8 +27,6 @@ import hdf.hdf5lib.callbacks.H5E_walk_cb; import hdf.hdf5lib.callbacks.H5E_walk_t; import hdf.hdf5lib.structs.H5E_error2_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Edefault.java b/java/test/TestH5Edefault.java index e807e27..9e93cea 100644 --- a/java/test/TestH5Edefault.java +++ b/java/test/TestH5Edefault.java @@ -18,7 +18,6 @@ import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Eparams.java b/java/test/TestH5Eparams.java index 2e40e94..e55f1fc 100644 --- a/java/test/TestH5Eparams.java +++ b/java/test/TestH5Eparams.java @@ -27,8 +27,6 @@ import hdf.hdf5lib.callbacks.H5E_walk_cb; import hdf.hdf5lib.callbacks.H5E_walk_t; import hdf.hdf5lib.structs.H5E_error2_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Eregister.java b/java/test/TestH5Eregister.java index cec51c2..99e8e5f 100644 --- a/java/test/TestH5Eregister.java +++ b/java/test/TestH5Eregister.java @@ -15,7 +15,6 @@ package test; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import hdf.hdf5lib.H5; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5F.java b/java/test/TestH5F.java index d016b27..16786b9 100644 --- a/java/test/TestH5F.java +++ b/java/test/TestH5F.java @@ -23,8 +23,6 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Fbasic.java b/java/test/TestH5Fbasic.java index 9310feb..4f3d928 100644 --- a/java/test/TestH5Fbasic.java +++ b/java/test/TestH5Fbasic.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Fparams.java b/java/test/TestH5Fparams.java index accca98..0376485 100644 --- a/java/test/TestH5Fparams.java +++ b/java/test/TestH5Fparams.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException; import hdf.hdf5lib.structs.H5F_info2_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Fswmr.java b/java/test/TestH5Fswmr.java index 88d683b..1ec78fe 100644 --- a/java/test/TestH5Fswmr.java +++ b/java/test/TestH5Fswmr.java @@ -22,8 +22,6 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5G.java b/java/test/TestH5G.java index cf51100..edf2cbe 100644 --- a/java/test/TestH5G.java +++ b/java/test/TestH5G.java @@ -25,8 +25,6 @@ import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5G_info_t; import hdf.hdf5lib.structs.H5O_token_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Gbasic.java b/java/test/TestH5Gbasic.java index 017452b..6e2e450 100644 --- a/java/test/TestH5Gbasic.java +++ b/java/test/TestH5Gbasic.java @@ -23,8 +23,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5G_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Giterate.java b/java/test/TestH5Giterate.java index 7eb44b7..388d2ac 100644 --- a/java/test/TestH5Giterate.java +++ b/java/test/TestH5Giterate.java @@ -20,7 +20,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5G_info_t; import hdf.hdf5lib.structs.H5O_token_t; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Lbasic.java b/java/test/TestH5Lbasic.java index 40397bf..a28fc3d 100644 --- a/java/test/TestH5Lbasic.java +++ b/java/test/TestH5Lbasic.java @@ -25,8 +25,6 @@ import hdf.hdf5lib.callbacks.H5L_iterate_opdata_t; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5L_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Lcreate.java b/java/test/TestH5Lcreate.java index 11c6d2c..44af2e5 100644 --- a/java/test/TestH5Lcreate.java +++ b/java/test/TestH5Lcreate.java @@ -27,8 +27,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5L_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Lparams.java b/java/test/TestH5Lparams.java index 4a1ce7e..30ee242 100644 --- a/java/test/TestH5Lparams.java +++ b/java/test/TestH5Lparams.java @@ -16,8 +16,6 @@ import static org.junit.Assert.assertTrue; import hdf.hdf5lib.H5; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Obasic.java b/java/test/TestH5Obasic.java index 4ab60bd..350b7aa 100644 --- a/java/test/TestH5Obasic.java +++ b/java/test/TestH5Obasic.java @@ -29,8 +29,6 @@ import hdf.hdf5lib.structs.H5O_token_t; import hdf.hdf5lib.structs.H5O_hdr_info_t; import hdf.hdf5lib.structs.H5_ih_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Ocopy.java b/java/test/TestH5Ocopy.java index df646ca..b3b1acd 100644 --- a/java/test/TestH5Ocopy.java +++ b/java/test/TestH5Ocopy.java @@ -23,8 +23,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Ocreate.java b/java/test/TestH5Ocreate.java index 3fc0f29..774a78d 100644 --- a/java/test/TestH5Ocreate.java +++ b/java/test/TestH5Ocreate.java @@ -27,8 +27,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5O_info_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -278,7 +276,7 @@ public class TestH5Ocreate { @Test public void testH5Oget_info_externallink() { - if (H5TestUtils.H5VLfapl_is_native(HDF5Constants.H5P_DEFAULT)) { + if (H5.H5VLfapl_is_native(HDF5Constants.H5P_DEFAULT)) { H5O_info_t obj_info = null; _createExternalLink(H5fid, H5_EXTFILE, "DT1", H5fid, "L1", HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); diff --git a/java/test/TestH5Oparams.java b/java/test/TestH5Oparams.java index 3a6f602..5cbabe1 100644 --- a/java/test/TestH5Oparams.java +++ b/java/test/TestH5Oparams.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertTrue; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5P.java b/java/test/TestH5P.java index 9db1e5a..3879128 100644 --- a/java/test/TestH5P.java +++ b/java/test/TestH5P.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5F_info2_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5PData.java b/java/test/TestH5PData.java index 9bf458c..8b04629 100644 --- a/java/test/TestH5PData.java +++ b/java/test/TestH5PData.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5PL.java b/java/test/TestH5PL.java index 738ff39..d44cc0b 100644 --- a/java/test/TestH5PL.java +++ b/java/test/TestH5PL.java @@ -17,7 +17,6 @@ import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 7d96aec..a65b52e 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -28,8 +28,6 @@ import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.exceptions.HDF5PropertyListInterfaceException; import hdf.hdf5lib.structs.H5AC_cache_config_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Pfaplhdfs.java b/java/test/TestH5Pfaplhdfs.java index 2631f99..d922666 100644 --- a/java/test/TestH5Pfaplhdfs.java +++ b/java/test/TestH5Pfaplhdfs.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5FD_hdfs_fapl_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Pfapls3.java b/java/test/TestH5Pfapls3.java index 48b1cfa..dda2716 100644 --- a/java/test/TestH5Pfapls3.java +++ b/java/test/TestH5Pfapls3.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5FD_ros3_fapl_t; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Plist.java b/java/test/TestH5Plist.java index 429915b..0d53071 100644 --- a/java/test/TestH5Plist.java +++ b/java/test/TestH5Plist.java @@ -44,7 +44,6 @@ import hdf.hdf5lib.callbacks.H5P_iterate_t; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.structs.H5AC_cache_config_t; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Pvirtual.java b/java/test/TestH5Pvirtual.java index f82cfab..0478356 100644 --- a/java/test/TestH5Pvirtual.java +++ b/java/test/TestH5Pvirtual.java @@ -24,8 +24,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5R.java b/java/test/TestH5R.java index 381ed08..031b8e4 100644 --- a/java/test/TestH5R.java +++ b/java/test/TestH5R.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5Rref.java b/java/test/TestH5Rref.java index b682d95..5733aae 100644 --- a/java/test/TestH5Rref.java +++ b/java/test/TestH5Rref.java @@ -26,8 +26,6 @@ import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/test/TestH5S.java b/java/test/TestH5S.java index 22a36f5..7eeed7a 100644 --- a/java/test/TestH5S.java +++ b/java/test/TestH5S.java @@ -20,7 +20,6 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Sbasic.java b/java/test/TestH5Sbasic.java index e4d052e..548ac95 100644 --- a/java/test/TestH5Sbasic.java +++ b/java/test/TestH5Sbasic.java @@ -17,7 +17,6 @@ import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5T.java b/java/test/TestH5T.java index de30b63..ed4e2a9 100644 --- a/java/test/TestH5T.java +++ b/java/test/TestH5T.java @@ -23,8 +23,6 @@ import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/java/test/TestH5Tbasic.java b/java/test/TestH5Tbasic.java index 082a66e..7aac2ab 100644 --- a/java/test/TestH5Tbasic.java +++ b/java/test/TestH5Tbasic.java @@ -17,7 +17,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5Tparams.java b/java/test/TestH5Tparams.java index a19698d..92a034c 100644 --- a/java/test/TestH5Tparams.java +++ b/java/test/TestH5Tparams.java @@ -15,7 +15,6 @@ package test; import static org.junit.Assert.assertTrue; import hdf.hdf5lib.H5; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/TestH5VL.java b/java/test/TestH5VL.java index c1766ff..49f0788 100644 --- a/java/test/TestH5VL.java +++ b/java/test/TestH5VL.java @@ -19,7 +19,6 @@ import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import java.io.File; @@ -172,7 +171,7 @@ public class TestH5VL { @Test(expected = HDF5LibraryException.class) public void testH5VLfapl_is_native() throws Throwable { - H5TestUtils.H5VLfapl_is_native(-1); + H5.H5VLfapl_is_native(-1); } } diff --git a/java/test/TestH5Z.java b/java/test/TestH5Z.java index 53e57de..fde8f1a 100644 --- a/java/test/TestH5Z.java +++ b/java/test/TestH5Z.java @@ -17,7 +17,6 @@ import static org.junit.Assert.fail; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5LibraryException; -import test.H5TestUtils; import org.junit.After; import org.junit.Before; diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index f2bb871..39db296 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -62,7 +62,6 @@ test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR LIST_LIBRARY_FILES=" $top_builddir/src/.libs/libhdf5.* $top_builddir/java/src/jni/.libs/libhdf5_java.* -$top_builddir/java/src/jni/.libs/libhdf5_java_test.* " LIST_JAR_TESTFILES=" $HDFLIB_HOME/hamcrest-core.jar @@ -151,21 +150,13 @@ COPY_LIBFILES_TO_BLDLIBDIR() fi fi done - - # Patch rpath for MacOS (Darwin) builds if [ "$IS_DARWIN" = "yes" ]; then (cd testlibs; \ install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \ - install_name_tool -add_rpath @loader_path libhdf5_java_test.dylib; \ exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \ -# echo "exist_path=" $exist_path; \ - install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib; \ - install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java_test.dylib; \ - exist_path2=` otool -l libhdf5_java_test.dylib | grep libhdf5_java | grep -v java_test | awk '{print $2}'`; \ -# echo "exist_path2=" $exist_path2; \ - install_name_tool -change $exist_path2 @rpath/libhdf5_java.dylib libhdf5_java_test.dylib) + echo $exist_path; \ + install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib) fi - # copy jar files. Used -f to make sure get a new copy for tstfile in $COPY_JARTESTFILES do diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in index 84a3ebf..573d657 100644 --- a/tools/test/h5diff/testh5diff.sh.in +++ b/tools/test/h5diff/testh5diff.sh.in @@ -600,7 +600,7 @@ $CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5 # Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR # environment variable supports virtual datasets (and external links) # -# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils +# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test $VDS_ELINK_COMPAT_VOL_BIN COMPAT_VOL=$? @@ -975,7 +975,6 @@ TOOLTEST h5diff_402.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlink TOOLTEST h5diff_403.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_dset1_1 /softlink_dset2 # extlink vs extlink (FILE)" -# Note: Requires VOL connector that supports external links ARGS="h5diff_404.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -986,7 +985,6 @@ else fi # extlink vs dset" -# Note: Requires VOL connector that supports external links ARGS="h5diff_405.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_trg.h5 /ext_link_dset1 /target_group2/x_dset" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -997,7 +995,6 @@ else fi # dset vs extlink" -# Note: Requires VOL connector that supports external links ARGS="h5diff_406.txt --follow-symlinks -v h5diff_extlink_trg.h5 h5diff_extlink_src.h5 /target_group2/x_dset /ext_link_dset1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1008,7 +1005,6 @@ else fi # extlink vs extlink" -# Note: Requires VOL connector that supports external links ARGS="h5diff_407.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_dset2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1019,7 +1015,6 @@ else fi # softlink vs extlink" -# Note: Requires VOL connector that supports external links ARGS="h5diff_408.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_extlink_src.h5 /softlink_dset1_1 /ext_link_dset2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1030,7 +1025,6 @@ else fi # extlink vs softlink " -# Note: Requires VOL connector that supports external links ARGS="h5diff_409.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_softlinks.h5 /ext_link_dset2 /softlink_dset1_1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1068,7 +1062,6 @@ TOOLTEST h5diff_417.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlink TOOLTEST h5diff_418.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_dset2 /softlink_noexist # non-exist-extlink_file vs extlink" -# Note: Requires VOL connector that supports external links ARGS="h5diff_419.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_noexist2 /ext_link_dset2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1079,7 +1072,6 @@ else fi # exlink vs non-exist-extlink_file" -# Note: Requires VOL connector that supports external links ARGS="h5diff_420.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset2 /ext_link_noexist2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1090,7 +1082,6 @@ else fi # extlink vs non-exist-extlink_obj" -# Note: Requires VOL connector that supports external links ARGS="h5diff_421.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset2 /ext_link_noexist1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1101,7 +1092,6 @@ else fi # non-exist-extlink_obj vs extlink" -# Note: Requires VOL connector that supports external links ARGS="h5diff_422.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_noexist1 /ext_link_dset2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1112,7 +1102,6 @@ else fi # extlink_to_softlink_to_dset1 vs dset2" -# Note: Requires VOL connector that supports external links ARGS="h5diff_423.txt --follow-symlinks -v h5diff_ext2softlink_src.h5 h5diff_ext2softlink_trg.h5 /ext_link_to_slink1 /dset2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1123,7 +1112,6 @@ else fi # dset2 vs extlink_to_softlink_to_dset1" -# Note: Requires VOL connector that supports external links ARGS="h5diff_424.txt --follow-symlinks -v h5diff_ext2softlink_trg.h5 h5diff_ext2softlink_src.h5 /dset2 /ext_link_to_slink1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1134,7 +1122,6 @@ else fi # extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2" -# Note: Requires VOL connector that supports external links ARGS="h5diff_425.txt --follow-symlinks -v h5diff_ext2softlink_src.h5 h5diff_ext2softlink_src.h5 /ext_link_to_slink1 /ext_link_to_slink2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1148,7 +1135,6 @@ fi # # Dangling links compare (--follow-symlinks and --no-dangling-links) # ############################################################################## # dangling links --follow-symlinks (FILE to FILE) -# Note: Requires VOL connector that supports external links ARGS="h5diff_450.txt --follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1174,7 +1160,6 @@ TOOLTEST h5diff_454.txt --follow-symlinks -v --no-dangling-links h5diff_softli TOOLTEST h5diff_455.txt --follow-symlinks -v --no-dangling-links h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_noexist /softlink_noexist # dangling link found for ext links (FILE to FILE) -# Note: Requires VOL connector that supports external links ARGS="h5diff_456.txt --follow-symlinks -v --no-dangling-links h5diff_extlink_src.h5 h5diff_extlink_src.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1185,7 +1170,6 @@ else fi # dangling link found for ext links (obj to obj). target file exist -# Note: Requires VOL connector that supports external links ARGS="h5diff_457.txt --follow-symlinks -v --no-dangling-links h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_noexist1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1196,7 +1180,6 @@ else fi # dangling link found for ext links (obj to obj). target file NOT exist -# Note: Requires VOL connector that supports external links ARGS="h5diff_458.txt --follow-symlinks -v --no-dangling-links h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_noexist2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1220,7 +1203,6 @@ TOOLTEST h5diff_467.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_dangl # ext dangling vs. ext dangling TOOLTEST h5diff_468.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link4 # ext link vs. ext dangling -# Note: Requires VOL connector that supports external links ARGS="h5diff_469.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link2" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1246,7 +1228,6 @@ TOOLTEST h5diff_475.txt -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_li # ############################################################################## # root TOOLTEST h5diff_500.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 / / -# Note: Requires VOL connector that supports external links ARGS="h5diff_501.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 / /" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1271,7 +1252,6 @@ TOOLTEST h5diff_506.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_r # groups vs ext-link TOOLTEST h5diff_507.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp1 /elink_grp1 -# Note: Requires VOL connector that supports external links ARGS="h5diff_508.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp1 /elink_grp1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1283,7 +1263,6 @@ fi # soft-link vs ext-link TOOLTEST h5diff_509.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1 -# Note: Requires VOL connector that supports external links ARGS="h5diff_510.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1295,7 +1274,6 @@ fi # circled ext links TOOLTEST h5diff_511.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp10 /grp11 -# Note: Requires VOL connector that supports external links ARGS="h5diff_512.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp10 /grp11" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1307,7 +1285,6 @@ fi # circled soft2ext-link vs soft2ext-link TOOLTEST h5diff_513.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp10 /slink_grp11 -# Note: Requires VOL connector that supports external links ARGS="h5diff_514.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp10 /slink_grp11" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1324,7 +1301,6 @@ fi ############################################################################### # file vs file TOOLTEST h5diff_515.txt -v h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5 -# Note: Requires VOL connector that supports external links ARGS="h5diff_516.txt -v --follow-symlinks h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1335,7 +1311,6 @@ else fi # group vs group TOOLTEST h5diff_517.txt -v h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5 /g1 -# Note: Requires VOL connector that supports external links ARGS="h5diff_518.txt -v --follow-symlinks h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5 /g1" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1419,8 +1394,6 @@ TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array # ############################################################################## # VDS tests # ############################################################################## - -# Note: Requires VOL connector that supports external links ARGS="h5diff_v1.txt -v 1_vds.h5 2_vds.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS @@ -1432,7 +1405,6 @@ fi TOOLTEST h5diff_v2.txt -r 1_vds.h5 2_vds.h5 -# Note: Requires VOL connector that supports external links ARGS="h5diff_v3.txt -c 1_vds.h5 2_vds.h5" if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then TOOLTEST $ARGS diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index 19b86b1..6a70b85 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -66,7 +66,7 @@ endmacro () ############################################################################## # Run test with different Virtual File Driver -foreach (vfd ${VFDP_LIST}) +foreach (vfd ${VFD_LIST}) # test for signed/unsigned datasets ADD_VFD_H5DUMP_TEST (${vfd} packedbits 0 --enable-error-stack packedbits.h5) endforeach () diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in index 8f4f7a1..ba5723e 100644 --- a/tools/test/h5dump/testh5dumpvds.sh.in +++ b/tools/test/h5dump/testh5dumpvds.sh.in @@ -505,7 +505,7 @@ COPY_TESTFILES_TO_TESTDIR # Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR # environment variable supports virtual datasets (and external links) # -# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils +# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test $VDS_ELINK_COMPAT_VOL_BIN COMPAT_VOL=$? @@ -513,43 +513,26 @@ COMPAT_VOL=$? # Data read if test $USE_FILTER_DEFLATE = "yes" ; then - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-1.ddl --enable-error-stack 1_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-2.ddl --enable-error-stack 2_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-3_1.ddl --enable-error-stack 3_1_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-3_2.ddl --enable-error-stack 3_2_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-4.ddl --enable-error-stack 4_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-5.ddl --enable-error-stack 5_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST vds-first.ddl --vds-view-first-missing --enable-error-stack vds-percival-unlim-maxmin.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST vds-gap1.ddl -d /VDS-Eiger --vds-gap-size=1 --enable-error-stack vds-eiger.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5 fi # Layout read if test $USE_FILTER_DEFLATE = "yes" ; then - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-3_1.ddl -p --enable-error-stack 3_1_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-3_2.ddl -p --enable-error-stack 3_2_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-4.ddl -p --enable-error-stack 4_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds_layout-5.ddl -p --enable-error-stack 5_vds.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST vds_layout-eiger.ddl -p --enable-error-stack vds-eiger.h5 - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST vds_layout-maxmin.ddl -p --enable-error-stack vds-percival-unlim-maxmin.h5 fi diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in index e322d41..03af8c4 100644 --- a/tools/test/h5ls/testh5ls.sh.in +++ b/tools/test/h5ls/testh5ls.sh.in @@ -321,7 +321,7 @@ COPY_TESTFILES_TO_TESTDIR # Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR # environment variable supports virtual datasets (and external links) # -# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils +# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test $VDS_ELINK_COMPAT_VOL_BIN COMPAT_VOL=$? @@ -361,32 +361,21 @@ TOOLTEST tsoftlinks-5.ls 0 --follow-symlinks tsoftlinks.h5/soft_dset1 # test for displaying external and user-defined links with --follow-symlinks TOOLTEST textlink-1.ls 0 -w80 -r textlink.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-1.ls 0 -w80 --follow-symlinks -r textlinksrc.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-2.ls 0 -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-3.ls 0 -w80 --follow-symlinks -r textlinksrc.h5/ext_link1 TOOLTEST textlinksrc-4.ls 0 -w80 -r textlinksrc.h5 TOOLTEST textlinksrc-5.ls 0 -w80 -r textlinksrc.h5/ext_link1 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-6.ls 0 -w80 --follow-symlinks textlinksrc.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-7.ls 0 -w80 --follow-symlinks textlinksrc.h5/ext_link1 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tudlink-1.ls 0 -w80 -r tudlink.h5 # test for displaying external links with -E # the option -E will be depriciated but keep it for backward compatibility -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-1-old.ls 0 -w80 -Er textlinksrc.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-2-old.ls 0 -w80 -Erv textlinksrc.h5/ext_link5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-3-old.ls 0 -w80 -Er textlinksrc.h5/ext_link1 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-6-old.ls 0 -w80 -E textlinksrc.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1 # tests for no-dangling-links @@ -394,7 +383,6 @@ COMPAT_VOL_TEST textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1 # when used alone , expect to print out help and return exit code 1 TOOLTEST textlinksrc-nodangle-1.ls 1 -w80 --no-dangling-links textlinksrc.h5 # external dangling link - expected exit code 1 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST textlinksrc-nodangle-2.ls 1 -w80 --follow-symlinks --no-dangling-links textlinksrc.h5 # soft dangling link - expected exit code 1 TOOLTEST tsoftlinks-nodangle-1.ls 1 -w80 --follow-symlinks --no-dangling-links tsoftlinks.h5 diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in index 1b60cce..e9623b0 100644 --- a/tools/test/h5ls/testh5lsvds.sh.in +++ b/tools/test/h5ls/testh5lsvds.sh.in @@ -260,23 +260,17 @@ COPY_TESTFILES_TO_TESTDIR # Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR # environment variable supports virtual datasets (and external links) # -# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils +# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test $VDS_ELINK_COMPAT_VOL_BIN COMPAT_VOL=$? ####### test for dataset vds ###### -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-1.ls 0 -w80 -v -S 1_vds.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-2.ls 0 -w80 -v -S 2_vds.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-3_1.ls 0 -w80 -v -S 3_1_vds.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-3_2.ls 0 -w80 -v -S 3_2_vds.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-4.ls 0 -w80 -v -S 4_vds.h5 -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST tvds-5.ls 0 -w80 -v -S 5_vds.h5 # Clean up temporary files/directories diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 27b08cb..ef89899 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -1342,7 +1342,7 @@ COPY_TESTFILES_TO_TESTDIR # Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR # environment variable supports virtual datasets (and external links) # -# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils +# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test $VDS_ELINK_COMPAT_VOL_BIN COMPAT_VOL=$? @@ -1762,35 +1762,30 @@ TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192 if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_dset_chunk_20x10x5 else - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_dset_chunk20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_chunk2x5x8 else - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_chunk2x5x8 3_1_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_chunk3x6x9 else - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_chunk3x6x9 2_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_compa 4_vds.h5 else - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_conti 4_vds.h5 else - # Note: Requires VOL connector that supports external links COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI fi @@ -1824,14 +1819,10 @@ VERIFY_EXTERNAL_CONSOLIDATION -l CONTI #TOOLTEST_DUMP h5copy_extlinks_src-base h5copy_extlinks_src.h5 --enable-error-stack TOOLTEST_DUMP tsoftlinks-base tsoftlinks.h5 --enable-error-stack TOOLTEST_DUMP textlink-base textlink.h5 --enable-error-stack -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST TOOLTEST_DUMP textlinkfar-base textlinkfar.h5 --enable-error-stack -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST TOOLTEST_DUMP textlinksrc-base textlinksrc.h5 --enable-error-stack -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST TOOLTEST_DUMP textlinktar-base textlinktar.h5 --enable-error-stack -# Note: Requires VOL connector that supports external links COMPAT_VOL_TEST TOOLTESTSV h5copy_extlinks_src-merge h5copy_extlinks_src.h5 --merge TOOLFAILSV tsoftlinks-merge tsoftlinks.h5 --merge TOOLTESTSV textlink-merge textlink.h5 --merge -- cgit v0.12