diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-07-18 21:21:56 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-07-18 21:21:56 +0000 |
| commit | ae2d100393355bea6e486013a184f32543cd3528 (patch) | |
| tree | c578d2908cf62e156ff9e0795a42e51286b7e698 /test/system | |
| parent | d6d1763f41c3b9351b969bfdd2c44dae779f9ee3 (diff) | |
a few fixes for java system test
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/CVC4JavaTest.java | 2 | ||||
| -rw-r--r-- | test/system/Makefile.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/system/CVC4JavaTest.java b/test/system/CVC4JavaTest.java index a35ee3771..168961b5c 100644 --- a/test/system/CVC4JavaTest.java +++ b/test/system/CVC4JavaTest.java @@ -17,7 +17,7 @@ import edu.nyu.acsys.CVC4.ParserBuilder; public class CVC4JavaTest { public static void main(String[] args) { try { - System.loadLibrary("cvc4bindings_java"); + System.loadLibrary("CVC4"); //CVC4.getDebugChannel().on("current"); diff --git a/test/system/Makefile.am b/test/system/Makefile.am index fb39acc4c..6430814a5 100644 --- a/test/system/Makefile.am +++ b/test/system/Makefile.am @@ -12,7 +12,7 @@ if CVC4_LANGUAGE_BINDING_JAVA TESTS += CVC4JavaTest.class endif -CLASS_LOG_COMPILER = @srcdir@/run_java_test $(JAVA) -classpath .:@abs_top_builddir@/src/bindings/cvc4.jar -Djava.library.path=$(abs_top_builddir)/src/bindings/.libs:$(abs_top_builddir)/src/.libs +CLASS_LOG_COMPILER = @srcdir@/run_java_test $(JAVA) -classpath .:@abs_top_builddir@/src/bindings/CVC4.jar -Djava.library.path=$(abs_top_builddir)/src/bindings/java/.libs:$(abs_top_builddir)/src/.libs # Things that aren't tests but that tests rely on and need to # go into the distribution @@ -74,8 +74,8 @@ $(filter-out %.class,$(TESTS)): %: %.lo $(LIBADD) $(AM_V_CXXLD)$(system_LINK) $(LIBADD) $(AM_LDFLAGS) $(LIBS) $< cvc3_main: cvc3_george.lo $(LIBADD) $(AM_V_CXXLD)$(system_LINK) $(LIBADD) $(AM_LDFLAGS) $(LIBS) $+ -CVC4JavaTest.class: CVC4JavaTest.java @abs_top_builddir@/src/bindings/cvc4.jar @abs_top_builddir@/src/bindings/libcvc4bindings_java.la - $(AM_V_JAVAC)$(JAVAC) -classpath @abs_top_builddir@/src/bindings/cvc4.jar -d $(builddir) $< +CVC4JavaTest.class: CVC4JavaTest.java @abs_top_builddir@/src/bindings/CVC4.jar @abs_top_builddir@/src/bindings/java/CVC4.la + $(AM_V_JAVAC)$(JAVAC) -classpath @abs_top_builddir@/src/bindings/CVC4.jar -d $(builddir) $< # for silent automake rules AM_V_JAVAC = $(am__v_JAVAC_$(V)) |