HDFFV-9739 Change autotools test scripts

1 files changed, 4 insertions, 12 deletions

diff --git a/java/test/Makefile.am b/java/test/Makefile.am
index f9db7ed..5616b2d 100644
--- a/java/test/Makefile.am
+++ b/java/test/Makefile.am
@@ -28,11 +28,14 @@ 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.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
+
 jarfile = jar$(PACKAGE_TARNAME)test.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.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
 AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation
 
+TESTPACKAGE = 
+
 noinst_JAVA = \
 	TestH5.java \
     TestH5Eparams.java \
@@ -81,17 +84,6 @@ TEST_SCRIPT = $(check_SCRIPTS)
 
 CLEANFILES = classnoinst.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/*.class junit.sh
 
-#JAVA_JUNIT  = $(JAVA_SRCS)
-#noinst_JAVA = @JAVA_JUNIT@
-#EXTRA_JAVA  = $(JAVA_JUNIT)
-TESTS_JUNIT = AllJunitTests
-#EXTRA_TEST  = $(TESTS_JUNIT)
-
-AllJunitTests :
-	echo "#! /bin/sh" > $@
-	echo "exec @JUNIT@ test.TestUnit" >> $@
-	chmod +x $@
-
 clean:
 	rm -rf $(JAVAROOT)/*
 	rm -f $(jarfile)