3:39 p.m.
---
align/Makefile.am | 4 +---
cat/Makefile.am | 4 +---
clone/Makefile.am | 4 +---
df/Makefile.am | 4 +---
edit/Makefile.am | 4 +---
fish/Makefile.am | 4 +---
haskell/Makefile.am | 4 +---
ocaml/Makefile.am | 4 +---
perl/Makefile.am | 4 +---
resize/Makefile.am | 4 +---
ruby/Makefile.am | 6 ++----
sparsify/Makefile.am | 4 +---
tests/luks/Makefile.am | 4 +---
tests/lvm/Makefile.am | 5 +----
tests/md/Makefile.am | 4 +---
tests/protocol/Makefile.am | 5 +----
tests/qemu/Makefile.am | 4 +---
tests/regressions/Makefile.am | 5 +----
tools/Makefile.am | 5 +----
19 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/align/Makefile.am b/align/Makefile.am
index 1dc9221..d1d1325 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -72,8 +72,6 @@ stamp-virt-alignment-scan.pod: virt-alignment-scan.pod
# TESTS_ENVIRONMENT = \
# MALLOC_PERTURB_=$(random_val) \
-# LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-# LIBGUESTFS_PATH=$(top_builddir)/appliance \
-# TMPDIR=$(top_builddir)
+# $(top_builddir)/run
# TESTS = test-virt-alignment-scan.sh
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 22433e3..c9889ca 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -132,8 +132,6 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh
diff --git a/clone/Makefile.am b/clone/Makefile.am
index 11a2e9b..3c54843 100644
--- a/clone/Makefile.am
+++ b/clone/Makefile.am
@@ -44,8 +44,6 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-sysprep.sh
diff --git a/df/Makefile.am b/df/Makefile.am
index 0f87d6e..455f45d 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -78,8 +78,6 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-df.sh
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 67ae713..c359c28 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -70,8 +70,6 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-edit.sh
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 658f1e0..ffe3ede 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -234,9 +234,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = \
test-add-domain.sh \
diff --git a/haskell/Makefile.am b/haskell/Makefile.am
index 3781f07..4ce05d4 100644
--- a/haskell/Makefile.am
+++ b/haskell/Makefile.am
@@ -28,9 +28,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
if HAVE_HASKELL
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
+ $(top_builddir)/run \
$(VG)
# Don't run the bindtests: they don't build since the addition of optargs.
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index fbeefc9..1dcf9f3 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -74,9 +74,7 @@ html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml
endif
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
+ $(top_builddir)/run \
$(VG)
TESTS = run-bindtests \
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 5ee6c49..7fc0eb6 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -51,9 +51,7 @@ TESTS = run-bindtests run-perl-tests
$(TESTS): src_deps all appliance test_images
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
INSTALLDIRS = site
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 639c46b..81e8f16 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -103,9 +103,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-resize.sh utils_tests
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 8139140..361277e 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -47,10 +47,8 @@ if HAVE_RUBY
TESTS = run-bindtests run-ruby-tests
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
- RUBY=$(RUBY)
+ RUBY=$(RUBY) \
+ $(top_builddir)/run
all: $(generator_built)
$(RAKE) build
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index 603fd07..e048d3f 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -96,9 +96,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
TESTS = test-virt-sparsify.sh
diff --git a/tests/luks/Makefile.am b/tests/luks/Makefile.am
index 30ec83b..fdbbb1b 100644
--- a/tests/luks/Makefile.am
+++ b/tests/luks/Makefile.am
@@ -25,9 +25,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
EXTRA_DIST = \
$(TESTS)
diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am
index 19c4ea3..7e89bab 100644
--- a/tests/lvm/Makefile.am
+++ b/tests/lvm/Makefile.am
@@ -25,10 +25,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
- PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
+ $(top_builddir)/run
EXTRA_DIST = \
$(TESTS)
diff --git a/tests/md/Makefile.am b/tests/md/Makefile.am
index 189f4ca..06352da 100644
--- a/tests/md/Makefile.am
+++ b/tests/md/Makefile.am
@@ -28,9 +28,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
EXTRA_DIST = \
$(TESTS)
\ No newline at end of file
diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am
index b7a446e..6e0f03f 100644
--- a/tests/protocol/Makefile.am
+++ b/tests/protocol/Makefile.am
@@ -30,10 +30,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
- PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
+ $(top_builddir)/run
EXTRA_DIST = \
$(TESTS)
diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am
index f2bdeb2..128296d 100644
--- a/tests/qemu/Makefile.am
+++ b/tests/qemu/Makefile.am
@@ -29,9 +29,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ $(top_builddir)/run
EXTRA_DIST = \
$(TESTS)
diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
index f71572a..2d2f595 100644
--- a/tests/regressions/Makefile.am
+++ b/tests/regressions/Makefile.am
@@ -32,11 +32,8 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
- PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch \
NOEXEC_CHECK="$(top_builddir)/src/.libs/libguestfs.so
$(top_builddir)/daemon/guestfsd"
+ $(top_builddir)/run
check_PROGRAMS = \
rhbz501893
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c025606..82b5852 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -59,10 +59,7 @@ random_val := $(shell awk 'BEGIN{srand(); print
1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir) \
- PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
+ $(top_builddir)/run
TESTS = test-virt-list-filesystems.sh \
test-virt-make-fs.sh \
--
1.7.8.3