diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-28 13:40:33 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-28 13:40:33 +0100 |
| commit | 8439e97f764872d8bc31c6bcf4c7b44afbc4523a (patch) | |
| tree | 6e8fc315892dcadc091ca541da7b1d223d536479 | |
| parent | 1b56aedc2b68a2db1e98c68d5344247742909e2e (diff) | |
| download | libguestfs-8439e97f764872d8bc31c6bcf4c7b44afbc4523a.tar.gz libguestfs-8439e97f764872d8bc31c6bcf4c7b44afbc4523a.tar.xz libguestfs-8439e97f764872d8bc31c6bcf4c7b44afbc4523a.zip | |
java: Use run --tests for tests.
Java-specific environment variables are set in the run script.
| -rw-r--r-- | java/Makefile.am | 8 | ||||
| -rw-r--r-- | run.in | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 613aac92..07faf0f8 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,5 +1,5 @@ # libguestfs Java bindings -# Copyright (C) 2009 Red Hat Inc. +# Copyright (C) 2009-2012 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -107,11 +107,7 @@ if ENABLE_APPLIANCE TESTS += run-java-tests endif ENABLE_APPLIANCE -TESTS_ENVIRONMENT = \ - JAVA=$(JAVA) \ - CLASSPATH=.:t:libguestfs-$(VERSION).jar \ - LIBGUESTFS_PATH=$(top_builddir)/appliance \ - TMPDIR=$(top_builddir) +TESTS_ENVIRONMENT = $(top_builddir)/run --test noinst_DATA = Bindtests.class $(java_tests:.java=.class) @@ -71,6 +71,10 @@ else fi export PYTHONPATH +# For Java. +export JAVA=@JAVA@ +export CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar" + # For GObject and friends. export GJS=@GJS@ if [ -z "$GI_TYPELIB_PATH" ]; then |