From 2eacd4a19157586ffa122318f1d2e2fd94a5e44f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 26 Jun 2012 23:34:42 +0100
Subject: fuse: Use the ./run --test script to run tests.

---
 fuse/Makefile.am  | 3 ++-
 fuse/test-fuse.sh | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index f9d513bd..1ab8c7bd 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -76,6 +76,7 @@ if ENABLE_APPLIANCE
 TESTS = test-fuse.sh
 endif ENABLE_APPLIANCE
 TESTS_ENVIRONMENT = \
-	top_builddir=..
+	top_builddir=.. \
+	$(top_builddir)/run --test
 
 endif HAVE_FUSE
diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
index 8dc658bb..255e524d 100755
--- a/fuse/test-fuse.sh
+++ b/fuse/test-fuse.sh
@@ -46,13 +46,6 @@ nr_stages=$(grep "^stage " $0 | wc -l)
 # and move to that directory for the initial phase of the script.
 top_builddir=$(cd "$top_builddir" > /dev/null; pwd)
 
-# Set TMPDIR so the appliance doesn't conflict with globally
-# installed libguestfs.
-export TMPDIR=$top_builddir
-
-# Set libguestfs up for running locally.
-export LIBGUESTFS_PATH="$top_builddir/appliance"
-
 # Paths to the other programs and files.  NB: Must be absolute paths.
 guestfish="$top_builddir/fish/guestfish"
 guestmount="$top_builddir/fuse/guestmount"
-- 
cgit