diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2012-01-21 22:39:59 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-01-23 09:08:21 +0000 |
| commit | 7004fafc6989efbbb1ef46723e8a91f936f16249 (patch) | |
| tree | 466136c1504c01979c251046db8a54fb2051f02b /tests | |
| parent | 5cfd3e7b3e1a7a4031f676d5b65392c7de113164 (diff) | |
| download | libguestfs-7004fafc6989efbbb1ef46723e8a91f936f16249.tar.gz libguestfs-7004fafc6989efbbb1ef46723e8a91f936f16249.tar.xz libguestfs-7004fafc6989efbbb1ef46723e8a91f936f16249.zip | |
Replace setting of environment variables with usage of local run script
(Includes fix by RWMJ)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/luks/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/lvm/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/md/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/protocol/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/qemu/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/regressions/Makefile.am | 7 |
6 files changed, 7 insertions, 22 deletions
diff --git a/tests/luks/Makefile.am b/tests/luks/Makefile.am index 30ec83b9..fdbbb1b6 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 19c4ea3b..7e89baba 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 189f4ca4..06352da6 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 b7a446e0..6e0f03f4 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 f2bdeb24..128296d3 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 f71572a2..c7784c2a 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" + NOEXEC_CHECK="$(top_builddir)/src/.libs/libguestfs.so $(top_builddir)/daemon/guestfsd" \ + $(top_builddir)/run check_PROGRAMS = \ rhbz501893 |