diff options
-rw-r--r-- | align/Makefile.am | 6 | ||||
-rw-r--r-- | cat/Makefile.am | 6 | ||||
-rw-r--r-- | df/Makefile.am | 6 | ||||
-rw-r--r-- | edit/Makefile.am | 6 | ||||
-rw-r--r-- | fish/Makefile.am | 6 | ||||
-rw-r--r-- | format/Makefile.am | 6 | ||||
-rw-r--r-- | resize/Makefile.am | 6 | ||||
-rw-r--r-- | run.in | 5 | ||||
-rw-r--r-- | sparsify/Makefile.am | 6 | ||||
-rw-r--r-- | sysprep/Makefile.am | 3 | ||||
-rw-r--r-- | tests/btrfs/Makefile.am | 6 | ||||
-rw-r--r-- | tests/charsets/Makefile.am | 3 | ||||
-rw-r--r-- | tests/disks/Makefile.am | 6 | ||||
-rw-r--r-- | tests/luks/Makefile.am | 6 | ||||
-rw-r--r-- | tests/lvm/Makefile.am | 3 | ||||
-rw-r--r-- | tests/md/Makefile.am | 6 | ||||
-rw-r--r-- | tests/ntfsclone/Makefile.am | 6 | ||||
-rw-r--r-- | tests/protocol/Makefile.am | 6 | ||||
-rw-r--r-- | tests/qemu/Makefile.am | 6 | ||||
-rw-r--r-- | tests/regressions/Makefile.am | 3 | ||||
-rw-r--r-- | tests/selinux/Makefile.am | 6 | ||||
-rw-r--r-- | tests/xml/Makefile.am | 9 | ||||
-rw-r--r-- | tools/Makefile.am | 6 |
23 files changed, 25 insertions, 103 deletions
diff --git a/align/Makefile.am b/align/Makefile.am index ab78e839..a9272cd2 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -70,10 +70,6 @@ stamp-virt-alignment-scan.pod: virt-alignment-scan.pod # Tests. -# random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -# TESTS_ENVIRONMENT = \ -# MALLOC_PERTURB_=$(random_val) \ -# $(top_builddir)/run --test +# TESTS_ENVIRONMENT = $(top_builddir)/run --test # TESTS = test-virt-alignment-scan.sh diff --git a/cat/Makefile.am b/cat/Makefile.am index f2c3ac86..66c6a91c 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -128,11 +128,7 @@ stamp-virt-filesystems.pod: virt-filesystems.pod # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh diff --git a/df/Makefile.am b/df/Makefile.am index 95da813c..4e153358 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -74,11 +74,7 @@ stamp-virt-df.pod: virt-df.pod # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-df.sh diff --git a/edit/Makefile.am b/edit/Makefile.am index e3f80b25..7efbdff5 100644 --- a/edit/Makefile.am +++ b/edit/Makefile.am @@ -66,11 +66,7 @@ stamp-virt-edit.pod: virt-edit.pod # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-edit.sh diff --git a/fish/Makefile.am b/fish/Makefile.am index 1d8f4d3f..487315b4 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -229,11 +229,7 @@ bashcompletion_DATA = guestfish-bash-completion.sh # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = \ test-a.sh \ diff --git a/format/Makefile.am b/format/Makefile.am index cc839288..4bfed1d6 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -67,11 +67,7 @@ stamp-virt-format.pod: virt-format.pod # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-format.sh diff --git a/resize/Makefile.am b/resize/Makefile.am index b613bb77..70ace37d 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -108,11 +108,7 @@ utils_tests: resize_gettext.cmx utils.cmx utils_tests.cmx $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ -cclib -lncurses -o $@ -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = utils_tests if ENABLE_APPLIANCE @@ -76,6 +76,11 @@ export GI_TYPELIB_PATH export LIBGUESTFS_PATH="$b/appliance" +# This is a cheap way to find some use-after-free and uninitialized +# read problems when using glibc. +random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)" +export MALLOC_PERTURB_=$random_val + # Do we have libtool? If we have it then we can use it to make # running valgrind simpler. However don't depend on it. if libtool --help >/dev/null 2>&1; then diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 5df30a80..bed51929 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -101,11 +101,7 @@ CLEANFILES += stamp-virt-sparsify.pod # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-sparsify.sh diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 7d20e102..2ad37aeb 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -162,10 +162,7 @@ sysprep-operations.pod: virt-sysprep # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ abs_builddir=$(abs_builddir) \ abs_srcdir=$(abs_srcdir) \ $(top_builddir)/run --test diff --git a/tests/btrfs/Makefile.am b/tests/btrfs/Makefile.am index 89f683c4..ff7a9725 100644 --- a/tests/btrfs/Makefile.am +++ b/tests/btrfs/Makefile.am @@ -21,11 +21,7 @@ TESTS = \ test-btrfs-devices.sh \ test-btrfs-subvolume-default.pl -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/charsets/Makefile.am b/tests/charsets/Makefile.am index 401f47f5..6be0dd02 100644 --- a/tests/charsets/Makefile.am +++ b/tests/charsets/Makefile.am @@ -20,10 +20,7 @@ include $(top_srcdir)/subdir-rules.mk TESTS = \ test-charset-fidelity -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ $(top_builddir)/run --test \ $(VG) diff --git a/tests/disks/Makefile.am b/tests/disks/Makefile.am index d1b57349..081c32cb 100644 --- a/tests/disks/Makefile.am +++ b/tests/disks/Makefile.am @@ -20,11 +20,7 @@ include $(top_srcdir)/subdir-rules.mk TESTS = \ test-max-disks.pl -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/luks/Makefile.am b/tests/luks/Makefile.am index cafef0ba..8954bd60 100644 --- a/tests/luks/Makefile.am +++ b/tests/luks/Makefile.am @@ -21,11 +21,7 @@ TESTS = \ test-luks.sh \ test-luks-list.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am index 3242e17c..75029773 100644 --- a/tests/lvm/Makefile.am +++ b/tests/lvm/Makefile.am @@ -21,10 +21,7 @@ TESTS = \ test-lvm-filtering.sh \ test-lvm-mapping.pl -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ $(top_builddir)/run --test EXTRA_DIST = \ diff --git a/tests/md/Makefile.am b/tests/md/Makefile.am index 2b4e7a10..781c208b 100644 --- a/tests/md/Makefile.am +++ b/tests/md/Makefile.am @@ -24,11 +24,7 @@ TESTS = \ test-list-md-devices.sh \ test-mdadm.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/ntfsclone/Makefile.am b/tests/ntfsclone/Makefile.am index fcce8100..80795c58 100644 --- a/tests/ntfsclone/Makefile.am +++ b/tests/ntfsclone/Makefile.am @@ -20,11 +20,7 @@ include $(top_srcdir)/subdir-rules.mk TESTS = \ test-ntfsclone.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am index 671b2626..ffe40ff6 100644 --- a/tests/protocol/Makefile.am +++ b/tests/protocol/Makefile.am @@ -26,11 +26,7 @@ TESTS = \ test-qemudie-midcommand.sh \ test-qemudie-synch.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am index af2061dc..25b65df0 100644 --- a/tests/qemu/Makefile.am +++ b/tests/qemu/Makefile.am @@ -25,11 +25,7 @@ TESTS = \ qemu-liveness.sh \ qemu-snapshot-isolation.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am index 22a364cc..78706e75 100644 --- a/tests/regressions/Makefile.am +++ b/tests/regressions/Makefile.am @@ -34,10 +34,7 @@ TESTS = \ tests_not_run = \ rhbz727178.sh -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ NOEXEC_CHECK="$(top_builddir)/src/.libs/libguestfs.so $(top_builddir)/daemon/guestfsd" \ $(top_builddir)/run --test diff --git a/tests/selinux/Makefile.am b/tests/selinux/Makefile.am index 47fdde54..71943b24 100644 --- a/tests/selinux/Makefile.am +++ b/tests/selinux/Makefile.am @@ -30,11 +30,7 @@ TESTS += \ test-selinux-fuse.sh endif -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ run-test.pl \ diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am index 04f9e685..797656a5 100644 --- a/tests/xml/Makefile.am +++ b/tests/xml/Makefile.am @@ -31,17 +31,14 @@ libfakevirtxml_la_CFLAGS = $(LIBVIRT_CFLAGS) # -version-info and -rpath force libtool to build a shared library. libfakevirtxml_la_LDFLAGS = -version-info 0:0:0 -rpath /nowhere -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS = \ - rhbz701814.pl - TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ abs_srcdir=$(abs_srcdir) \ LD_PRELOAD=.libs/libfakevirtxml.so \ $(top_builddir)/run --test +TESTS = \ + rhbz701814.pl + endif EXTRA_DIST = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index a5d9844c..2c2ad1f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -55,11 +55,7 @@ $(top_builddir)/html/virt-%.1.html: virt-% # Tests. -random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null) - -TESTS_ENVIRONMENT = \ - MALLOC_PERTURB_=$(random_val) \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test if ENABLE_APPLIANCE TESTS = test-virt-list-filesystems.sh \ |