summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-06-27 20:39:53 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-06-27 20:39:53 (GMT)
commit32c483cb86031962a09ecdb49dcb331d28dddee9 (patch)
tree24d227fe2643aa9002935b1d4ee0edb508a5cb3a /java
parent30776671fb0a27a98b0640aa968f850241a862ce (diff)
downloadhdf5-32c483cb86031962a09ecdb49dcb331d28dddee9.zip
hdf5-32c483cb86031962a09ecdb49dcb331d28dddee9.tar.gz
hdf5-32c483cb86031962a09ecdb49dcb331d28dddee9.tar.bz2
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.
Diffstat (limited to 'java')
-rw-r--r--java/test/junit.sh.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 598b3d2..d9ff5a5 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@"
@@ -43,8 +42,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
@@ -204,10 +203,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
}