diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-06-30 02:18:27 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-07 16:02:21 (GMT) |
| commit | f9c38c62531c95fb0e76a74dd18cc9e7c9a782b0 (patch) | |
| tree | 054ce2d05451ffa723f6f40d8ee40534dc0597a0 | |
| parent | 8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9 (diff) | |
| download | hdf5-f9c38c62531c95fb0e76a74dd18cc9e7c9a782b0.zip hdf5-f9c38c62531c95fb0e76a74dd18cc9e7c9a782b0.tar.gz hdf5-f9c38c62531c95fb0e76a74dd18cc9e7c9a782b0.tar.bz2 | |
Merge pull request #2667 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '32c483cb86031962a09ecdb49dcb331d28dddee9':
Copy lib files for junit.sh to temporary subdirectory of <build directory>/java/test instead of to the prefix/lib directory. Fix for HDFFV-11063.
| -rw-r--r-- | java/test/junit.sh.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 3fee3cc..cbc57e9 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -15,7 +15,6 @@ top_builddir=@top_builddir@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ USE_FILTER_SZIP="@USE_FILTER_SZIP@" USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" @@ -44,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 @@ -212,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 } |