mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
Replace setting of environment variables with usage of local run script
(Includes fix by RWMJ)
This commit is contained in:
committed by
Richard W.M. Jones
parent
5cfd3e7b3e
commit
7004fafc69
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user