From b4e5f33592228a9b42bec97f9f295e97b776ea62 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 7 Jan 2006 19:54:27 +0000 Subject: [PATCH] Specify classpath which is needed should the CLASSPATH env variable be set git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8280 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Examples/test-suite/java/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SWIG/Examples/test-suite/java/Makefile.in b/SWIG/Examples/test-suite/java/Makefile.in index 55154f3f2..9a55aa918 100644 --- a/SWIG/Examples/test-suite/java/Makefile.in +++ b/SWIG/Examples/test-suite/java/Makefile.in @@ -29,9 +29,6 @@ CPP_TEST_CASES = \ java_typemaps_proxy \ java_typemaps_typewrapper -# This testcase requires Java 1.5 -# enum_thorough_proper \ - include $(srcdir)/../common.mk # Overridden variables here @@ -68,10 +65,10 @@ setup = \ # a file is found which has _runme.java appended after the testcase name. # Note Java uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows, SHLIB_PATH on HPUX and DYLD_LIBRARY_PATH on Mac OS X. run_testcase = \ - (cd $* && javac *.java; ) && \ + (cd $* && javac -classpath . *.java; ) && \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ - javac -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ - env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" java $*\_runme;) \ + javac -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ + env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" java -classpath . $*\_runme;) \ fi; # Clean: remove testcase directories