diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-08-28 15:10:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 15:10:30 (GMT) |
| commit | bfe867c4cb7b636da21ff4245a2c1da6d96f1955 (patch) | |
| tree | 255458f04e77656b28b06aa0d058bacaa78c069c /java/test | |
| parent | 11f3fee390def4b6af0a3770db8a9f53f8805dfc (diff) | |
| download | hdf5-bfe867c4cb7b636da21ff4245a2c1da6d96f1955.zip hdf5-bfe867c4cb7b636da21ff4245a2c1da6d96f1955.tar.gz hdf5-bfe867c4cb7b636da21ff4245a2c1da6d96f1955.tar.bz2 | |
sync cmake and examples changes (#3438)
* sync cmake and examples changes
* Add java lib changes
* Update jave log files
* Update java logger version
* More logger version changes
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/Makefile.am | 2 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/test/Makefile.am b/java/test/Makefile.am index a18ed93..f9f0ab8 100644 --- a/java/test/Makefile.am +++ b/java/test/Makefile.am @@ -27,7 +27,7 @@ classes: pkgpath = test hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar -CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH +CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)test.jar diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 9f5334c..a407c5c 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -67,8 +67,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.* LIST_JAR_TESTFILES=" $HDFLIB_HOME/hamcrest-core.jar $HDFLIB_HOME/junit.jar -$HDFLIB_HOME/slf4j-api-1.7.33.jar -$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar +$HDFLIB_HOME/slf4j-api-2.0.6.jar +$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar " LIST_JAR_FILES=" $top_builddir/java/src/$JARFILE @@ -299,7 +299,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@ COPY_LIBFILES_TO_BLDLIBDIR COPY_DATAFILES_TO_BLDDIR -CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE"" +CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE"" TEST=/usr/bin/test if [ ! -x /usr/bin/test ] |