From e7d2d3cb8905598b57c4d24a933ef25fdb021b1d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 28 Jun 2012 13:41:40 +0100
Subject: ruby: Use run --tests for tests.

---
 ruby/Makefile.am | 4 +---
 run.in           | 3 +++
 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"
-- 
cgit