diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-08-02 14:58:48 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-08-02 14:58:48 (GMT) |
| commit | c234479258038be93e059a6964bf19332ef162f8 (patch) | |
| tree | 218b42c2fd34c9db8114f4b7678efe3a47023303 /java | |
| parent | bc1e6c5097d62593ec8089e5cde5ae59c2cb7792 (diff) | |
| download | hdf5-c234479258038be93e059a6964bf19332ef162f8.zip hdf5-c234479258038be93e059a6964bf19332ef162f8.tar.gz hdf5-c234479258038be93e059a6964bf19332ef162f8.tar.bz2 | |
Update junit.sh.in to copy lib files to $prefix/lib.
Correct checking for s3 and hdfs options.
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/junit.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 008c89c..ac09db7 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -15,6 +15,7 @@ top_builddir=@top_builddir@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ +prefix=@prefix@ USE_FILTER_SZIP="@USE_FILTER_SZIP@" USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" @@ -42,7 +43,7 @@ myos=`uname -s` # where the libs exist HDFLIB_HOME="$top_srcdir/java/lib" -BLDLIBDIR="$top_builddir/hdf5/lib" +BLDLIBDIR="$prefix/lib" BLDDIR="." HDFTEST_HOME="$top_srcdir/java/test" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar @@ -1100,7 +1101,7 @@ if test $USE_FILTER_SZIP = "yes"; then test yes = "$verbose" && $DIFF JUnit-TestH5Giterate.txt JUnit-TestH5Giterate.out |sed 's/^/ /' fi fi -if test $ROS3_VFD = "yes"; then +if test "X$ROS3_VFD" = "Xyes"; then echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfapls3" TESTING JUnit-TestH5Pfapls3 ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfapls3 > JUnit-TestH5Pfapls3.ext) @@ -1122,7 +1123,7 @@ if test $ROS3_VFD = "yes"; then test yes = "$verbose" && $DIFF JUnit-TestH5Pfapls3.txt JUnit-TestH5Pfapls3.out |sed 's/^/ /' fi fi -if test $HAVE_LIBHDFS = "yes"; then +if test "X$HAVE_LIBHDFS" = "Xyes"; then echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfaplhdfs" TESTING JUnit-TestH5Pfaplhdfs ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfaplhdfs > JUnit-TestH5Pfaplhdfs.ext) |