diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-07-02 19:47:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-07-02 19:47:13 (GMT) |
| commit | 5356fb168792852cd272edcc21415e7ab54f0f2f (patch) | |
| tree | c983b0bdd8e88ece2eb8bd2957d9921be59258d9 /java | |
| parent | 88e8597cdef826c1087e4ec1383657a91dcb2a43 (diff) | |
| parent | 4c2071bfd3270dc3a688914b4a058147b94b7023 (diff) | |
| download | hdf5-5356fb168792852cd272edcc21415e7ab54f0f2f.zip hdf5-5356fb168792852cd272edcc21415e7ab54f0f2f.tar.gz hdf5-5356fb168792852cd272edcc21415e7ab54f0f2f.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '4c2071bfd3270dc3a688914b4a058147b94b7023':
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 d9ff5a5..cbc57e9 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -20,6 +20,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 |