[PATCH] Prepend local library path to LD_LIBRARY_PATH for tests, instead of replacing it
Overwriting LD_LIBRARY_PATH broke some tests when running with fakeroot. --- align/Makefile.am | 2 +- cat/Makefile.am | 2 +- clone/Makefile.am | 2 +- df/Makefile.am | 2 +- edit/Makefile.am | 2 +- fish/Makefile.am | 2 +- haskell/Makefile.am | 2 +- ocaml/Makefile.am | 2 +- perl/Makefile.am | 2 +- resize/Makefile.am | 2 +- ruby/Makefile.am | 2 +- sparsify/Makefile.am | 2 +- tests/luks/Makefile.am | 2 +- tests/lvm/Makefile.am | 2 +- tests/md/Makefile.am | 2 +- tests/protocol/Makefile.am | 2 +- tests/qemu/Makefile.am | 2 +- tests/regressions/Makefile.am | 2 +- tools/Makefile.am | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/align/Makefile.am b/align/Makefile.am index 1dc9221..4afb2e4 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -72,7 +72,7 @@ stamp-virt-alignment-scan.pod: virt-alignment-scan.pod # TESTS_ENVIRONMENT = \ # MALLOC_PERTURB_=$(random_val) \ -# LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ +# LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ # LIBGUESTFS_PATH=$(top_builddir)/appliance \ # TMPDIR=$(top_builddir) diff --git a/cat/Makefile.am b/cat/Makefile.am index 3180b26..2a42954 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -132,7 +132,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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/clone/Makefile.am b/clone/Makefile.am index 11a2e9b..5eb542c 100644 --- a/clone/Makefile.am +++ b/clone/Makefile.am @@ -44,7 +44,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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/df/Makefile.am b/df/Makefile.am index 2b2c47e..2c0d249 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -78,7 +78,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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/edit/Makefile.am b/edit/Makefile.am index d94e42e..8336e78 100644 --- a/edit/Makefile.am +++ b/edit/Makefile.am @@ -70,7 +70,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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/fish/Makefile.am b/fish/Makefile.am index 2624a7d..2eb2e11 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -234,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 5c1ff98..58bb30c 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -28,7 +28,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests if HAVE_HASKELL TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ $(VG) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 95185ef..1d7a5c6 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -71,7 +71,7 @@ html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml endif TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ $(VG) diff --git a/perl/Makefile.am b/perl/Makefile.am index 4c78f87..4f86de1 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -51,7 +51,7 @@ TESTS = run-bindtests run-perl-tests $(TESTS): src_deps all appliance test_images TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/resize/Makefile.am b/resize/Makefile.am index 3f33118..d8ce376 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -103,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 8139140..cf8a072 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -47,7 +47,7 @@ if HAVE_RUBY TESTS = run-bindtests run-ruby-tests TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ RUBY=$(RUBY) diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 9d5e076..5c88d2d 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -96,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/tests/luks/Makefile.am b/tests/luks/Makefile.am index 2bc21ed..7d6b91a 100644 --- a/tests/luks/Makefile.am +++ b/tests/luks/Makefile.am @@ -25,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am index 9c4c137..ec20f72 100644 --- a/tests/lvm/Makefile.am +++ b/tests/lvm/Makefile.am @@ -25,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch diff --git a/tests/md/Makefile.am b/tests/md/Makefile.am index c778956..dc6b5ef 100644 --- a/tests/md/Makefile.am +++ b/tests/md/Makefile.am @@ -28,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am index ce9282e..1c1d918 100644 --- a/tests/protocol/Makefile.am +++ b/tests/protocol/Makefile.am @@ -30,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am index f2bdeb2..0285b81 100644 --- a/tests/qemu/Makefile.am +++ b/tests/qemu/Makefile.am @@ -29,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am index e43d9e9..0af53cb 100644 --- a/tests/regressions/Makefile.am +++ b/tests/regressions/Makefile.am @@ -32,7 +32,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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 2ecd0ee..29ce4f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -59,7 +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 \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch -- 1.7.8.3
On Tue, Jan 10, 2012 at 11:08:58PM +0100, Hilko Bengen wrote:
Overwriting LD_LIBRARY_PATH broke some tests when running with fakeroot. [...] diff --git a/align/Makefile.am b/align/Makefile.am index 1dc9221..4afb2e4 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -72,7 +72,7 @@ stamp-virt-alignment-scan.pod: virt-alignment-scan.pod
# TESTS_ENVIRONMENT = \ # MALLOC_PERTURB_=$(random_val) \ -# LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ +# LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ # LIBGUESTFS_PATH=$(top_builddir)/appliance \ # TMPDIR=$(top_builddir)
The patch seems fine as it is, but I wonder if it's better to replace these environment variables with a call to 'run', as in: TESTS_ENVIRONMENT = \ MALLOC_PERTURB_=... \ $(top_builddir)/run Note that run already does the right thing with LD_LIBRARY_PATH. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
participants (2)
-
Hilko Bengen -
Richard W.M. Jones