summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-28 13:41:40 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-28 13:41:40 +0100
commite7d2d3cb8905598b57c4d24a933ef25fdb021b1d (patch)
tree8ef24fd7991a33cbc49c8c09e45d83899e4beade
parent8439e97f764872d8bc31c6bcf4c7b44afbc4523a (diff)
downloadlibguestfs-e7d2d3cb8905598b57c4d24a933ef25fdb021b1d.tar.gz
libguestfs-e7d2d3cb8905598b57c4d24a933ef25fdb021b1d.tar.xz
libguestfs-e7d2d3cb8905598b57c4d24a933ef25fdb021b1d.zip
ruby: Use run --tests for tests.
-rw-r--r--ruby/Makefile.am4
-rw-r--r--run.in3
2 files changed, 4 insertions, 3 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 35599c30..37eb3f36 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -49,9 +49,7 @@ if HAVE_RUBY
TESTS = run-bindtests run-ruby-tests
-TESTS_ENVIRONMENT = \
- RUBY=$(RUBY) \
- $(top_builddir)/run --test
+TESTS_ENVIRONMENT = $(top_builddir)/run --test
all: $(generator_built)
$(RAKE) build
diff --git a/run.in b/run.in
index 00fc9f17..1d34be18 100644
--- a/run.in
+++ b/run.in
@@ -71,6 +71,9 @@ else
fi
export PYTHONPATH
+# For Ruby.
+export RUBY=@RUBY@
+
# For Java.
export JAVA=@JAVA@
export CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"