diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-02 19:14:53 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-06 19:21:53 (GMT) |
| commit | c6f2205abefa1a098bbb2b38a0318596fbb16eb3 (patch) | |
| tree | 8d01fe5d6d4e09b9c048aa445bcdc0a06052633c /java | |
| parent | 37f6de1b3037a2b7a569c2edb08f58f8ba323af0 (diff) | |
| download | hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.zip hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.tar.gz hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.tar.bz2 | |
Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fc69de0e8ae30e80c1c3c542b156226a75444525':
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. Fix for HDFFV-11063
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/junit.sh.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 125ea46..1a6a5c8 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -21,6 +21,7 @@ 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 @@ -145,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.1000.dylib libhdf5_java.dylib) + fi # copy jar files. Used -f to make sure get a new copy for tstfile in $COPY_JARTESTFILES do |