diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-07 21:28:28 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-07 21:28:28 (GMT) |
commit | fb6a64c04db4fdb23bc76b3eea2aa9a146304da2 (patch) | |
tree | 7deeffd6c2014d711a807dd9b2904e34351e9426 | |
parent | 1cb7c1329759d92be95498cad0ecb5abb9b52f8d (diff) | |
parent | 1d1cba787f0c7f5c752e6ca7c0286190091d3f3b (diff) | |
download | hdf5-fb6a64c04db4fdb23bc76b3eea2aa9a146304da2.zip hdf5-fb6a64c04db4fdb23bc76b3eea2aa9a146304da2.tar.gz hdf5-fb6a64c04db4fdb23bc76b3eea2aa9a146304da2.tar.bz2 |
Merge pull request #2678 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_12 to hdf5_1_12
* commit '1d1cba787f0c7f5c752e6ca7c0286190091d3f3b':
Change load path in libhdf5_java.dylib to unversioned libhdf5.dylib for junit tests on Macs.
Merge pull request #2667 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | java/test/junit.sh.in | 16 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 9 |
3 files changed, 23 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 8585f5c..4a610d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,12 +1149,13 @@ AC_CHECK_HEADERS([stdint.h], [C9x=yes]) AC_CHECK_HEADERS([stdbool.h]) ## Darwin -AC_CHECK_HEADERS([mach/mach_time.h]) -## Also need to detect Darwin for pubconf +AC_SUBST([H5_IS_DARWIN]) +H5_IS_DARWIN="no" case $host_os in darwin*) AC_DEFINE([HAVE_DARWIN], [1], [Define if Darwin or Mac OS X]) - ;; + H5_IS_DARWIN="yes" + ;; esac ## Windows diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 598b3d2..62a5104 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -15,12 +15,12 @@ top_builddir=@top_builddir@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ USE_FILTER_SZIP="@USE_FILTER_SZIP@" USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" USE_ROS3_VFD="@HAVE_ROS3_VFD@" USE_HDFS_VFD="@HAVE_LIBHDFS@" +IS_DARWIN="@H5_IS_DARWIN@" TESTNAME=JUnitInterface EXIT_SUCCESS=0 @@ -43,8 +43,8 @@ myos=`uname -s` # where the libs exist HDFLIB_HOME="$top_srcdir/java/lib" -BLDLIBDIR="$prefix/lib" BLDDIR="." +BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/test" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar TESTJARFILE=jar@PACKAGE_TARNAME@test.jar @@ -146,6 +146,13 @@ COPY_LIBFILES_TO_BLDLIBDIR() fi fi done + if [ "$IS_DARWIN" = "yes" ]; then + (cd testlibs; \ + install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \ + exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \ + 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 @@ -204,10 +211,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then - for tstfile in $COPY_JARTESTFILES - do - $RM $BLDLIBDIR/tstfile - done + $RM -rf $BLDLIBDIR fi } diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index cd83b63..f56c7ac 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -160,6 +160,15 @@ Bug Fixes since HDF5-1.12.0 release (QAK - 2020/06/05) + Testing + ------- + - Stopped java/test/junit.sh.in installing libs for testing under ${prefix} + + Lib files needed are now copied to a subdirectory in the java/test + directory, and on Macs the loader path for libhdf5.xxxs.so is changed + in the temporary copy of libhdf5_java.dylib. + + (LRK, 2020/7/2, HDFFV-11063) Supported Platforms |