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:
Richard W.M. Jones
2016-10-11 18:02:16 +01:00
parent 9bcdffc2bb
commit d6c42a6c58
20 changed files with 20 additions and 20 deletions

View File

@@ -90,4 +90,4 @@ TESTS += \
endif
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check

View File

@@ -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

View File

@@ -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

View File

@@ -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 \

View File

@@ -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.

View File

@@ -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)"

View File

@@ -82,4 +82,4 @@ TESTS += \
endif ENABLE_APPLIANCE
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check

View File

@@ -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:

View File

@@ -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 \

View File

@@ -76,4 +76,4 @@ TESTS += \
endif ENABLE_APPLIANCE
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check

View File

@@ -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 \

View File

@@ -76,4 +76,4 @@ TESTS += \
endif ENABLE_APPLIANCE
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check

View File

@@ -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

View File

@@ -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

View File

@@ -119,7 +119,7 @@ TESTS += \
endif
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check
# Dependencies.
depend: .depend

View File

@@ -126,7 +126,7 @@ TESTS += \
endif ENABLE_APPLIANCE
check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
$(MAKE) VG="@VG@" check
# Dependencies.
depend: .depend

View File

@@ -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 \

View File

@@ -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

View File

@@ -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)

View File

@@ -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) \