diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 18:03:28 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 19:25:40 -0400 |
| commit | e070c4a6d716407916c65a66ea9f019d1681ae8e (patch) | |
| tree | 0bc25d1889866944515c8ccb504c0f2da0c95325 /test | |
| parent | dde893d63a162346fc35663118f9d341524e578b (diff) | |
Some fixes for GCC 4.2, and for Java on Mac
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/Makefile.am | 4 | ||||
| -rwxr-xr-x | test/system/run_java_test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/system/Makefile.am b/test/system/Makefile.am index e8e3f8c87..d79fcb7ba 100644 --- a/test/system/Makefile.am +++ b/test/system/Makefile.am @@ -18,7 +18,9 @@ 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/java/.libs:$(abs_top_builddir)/src/.libs +# we set the DYLD_LIBRARY_PATH in addition to -Djava.library.path, seems +# to be necessary on Mac +CLASS_LOG_COMPILER = env DYLD_LIBRARY_PATH=$(abs_top_builddir)/src/bindings/java/.libs:$(abs_top_builddir)/src/.libs:$(abs_top_builddir)/src/parser/.libs @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:$(abs_top_builddir)/src/parser/.libs # Things that aren't tests but that tests rely on and need to # go into the distribution diff --git a/test/system/run_java_test b/test/system/run_java_test index 205d869f2..24947d523 100755 --- a/test/system/run_java_test +++ b/test/system/run_java_test @@ -9,6 +9,6 @@ # Works only for tests in the default package. # args=("$@") -args[$((${#args}))]="$(echo "${args[${#args}]}" | sed 's,\(.*\/\)\?\(.*\)\.class$,\2,')" +args[$((${#args}))]="$(echo "${args[${#args}]}" | sed 's,\(.*/\)*\(.*\)\.class$,\2,')" echo "${args[@]}" exec "${args[@]}" |