mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
valgrind: Don't use "nested" run scripts.
When TESTS_ENVIRONMENT already uses 'run', the VG variable
doesn't also need to use 'run'.
The specific problem is that if the command contains newlines
then double invocations of the 'run' script fails (in libtool).
ie the following command failed causing errors in check-valgrind:
$VG virt-builder phony-fedora \
-v --no-cache --no-check-signature $no_network \
...
--write '/etc/append4:line1
' \
...
This commit is contained in:
@@ -90,4 +90,4 @@ TESTS += \
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
@@ -251,7 +251,7 @@ TESTS += yajl_tests
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
SLOW_TESTS = test-virt-builder-planner.sh
|
||||
|
||||
|
||||
@@ -49,4 +49,4 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
|
||||
TESTS = validate.sh
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
@@ -201,7 +201,7 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
check-valgrind-local-guests:
|
||||
for g in $(GUESTS); do \
|
||||
|
||||
@@ -201,7 +201,7 @@ TESTS += \
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
# Slow tests of virt-customize functionality in real guests.
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
check-valgrind-local-guests:
|
||||
$(top_builddir)/run --test @VG@ virt-df -c "$(libvirt_ro_uri)"
|
||||
|
||||
@@ -82,4 +82,4 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
@@ -669,7 +669,7 @@ use:
|
||||
and in the F<Makefile.am> use:
|
||||
|
||||
check-valgrind:
|
||||
make VG="$(top_builddir)/run @VG@" check
|
||||
make VG="@VG@" check
|
||||
|
||||
However, if your binaries run directly from the C<TESTS> rule, you
|
||||
have to modify the F<Makefile.am> like this:
|
||||
|
||||
@@ -342,7 +342,7 @@ endif
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh test-tilde.sh test-upload-to-dir.sh" VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh test-tilde.sh test-upload-to-dir.sh" VG="@VG@" check
|
||||
|
||||
EXTRA_DIST += \
|
||||
test-a.sh \
|
||||
|
||||
@@ -76,4 +76,4 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
@@ -104,7 +104,7 @@ TESTS += test-xmllint.sh
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) TESTS="test-virt-inspector.sh" VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) TESTS="test-virt-inspector.sh" VG="@VG@" check
|
||||
|
||||
check-valgrind-local-guests:
|
||||
for g in $(GUESTS); do \
|
||||
|
||||
@@ -76,4 +76,4 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
@@ -249,7 +249,7 @@ TESTS += common_utils_tests JSON_tests
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
# Dependencies.
|
||||
depend: .depend
|
||||
|
||||
@@ -93,4 +93,4 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) TESTS="test-virt-rescue-suggest.sh" VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) TESTS="test-virt-rescue-suggest.sh" VG="@VG@" check
|
||||
|
||||
@@ -119,7 +119,7 @@ TESTS += \
|
||||
endif
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
# Dependencies.
|
||||
depend: .depend
|
||||
|
||||
@@ -126,7 +126,7 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
# Dependencies.
|
||||
depend: .depend
|
||||
|
||||
@@ -188,7 +188,7 @@ endif HAVE_FUSE
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) TESTS="test-virt-sysprep.sh" VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) TESTS="test-virt-sysprep.sh" VG="@VG@" check
|
||||
|
||||
check-valgrind-local-guests:
|
||||
for g in $(GUESTS); do \
|
||||
|
||||
@@ -39,7 +39,7 @@ test_parallel_LDADD = \
|
||||
$(top_builddir)/gnulib/lib/libgnu.la
|
||||
|
||||
#check-valgrind:
|
||||
# $(MAKE) VG="$(top_builddir)/run @VG@" TESTS="test-parallel" check
|
||||
# $(MAKE) VG="@VG@" TESTS="test-parallel" check
|
||||
|
||||
check-slow:
|
||||
$(MAKE) check TESTS="$(SLOW_TESTS)" SLOW=1
|
||||
|
||||
@@ -31,7 +31,7 @@ TESTS = \
|
||||
TESTS_ENVIRONMENT = $(top_builddir)/run --test
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(TESTS)
|
||||
|
||||
@@ -296,7 +296,7 @@ TESTS += \
|
||||
endif ENABLE_APPLIANCE
|
||||
|
||||
check-valgrind:
|
||||
$(MAKE) VG="$(abs_top_builddir)/run @VG@" check
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
SLOW_TESTS = \
|
||||
$(real_guests_scripts) \
|
||||
|
||||
Reference in New Issue
Block a user