From: Richard W.M. Jones Date: Tue, 29 Nov 2011 12:51:20 +0000 (+0000) Subject: extra tests: Split VG variable into VG / RUN_VG. X-Git-Tag: 1.15.7~4 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=6ccae55ddcf0c08cd1b1cdbc07afeed043ad410d;p=libguestfs.git extra tests: Split VG variable into VG / RUN_VG. This is just code motion. --- diff --git a/extratests/Makefile.am b/extratests/Makefile.am index 72118ed..a3b9a2f 100644 --- a/extratests/Makefile.am +++ b/extratests/Makefile.am @@ -27,12 +27,12 @@ EXTRA_DIST = suppressions -VG = ../run \ - valgrind \ - --log-file=valgrind.log \ +VG = valgrind \ + --log-file=$(abs_builddir)/valgrind.log \ --leak-check=full \ --error-exitcode=119 \ - --suppressions=suppressions + --suppressions=$(abs_srcdir)/suppressions +RUN_VG = ../run $(VG) export LIBVIRT_DEFAULT_URI = \ qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock-ro @@ -46,48 +46,48 @@ extra-tests: test-tools-null test-tools-internal test-tools-real # Null invocations of the basic tools shouldn't leak memory. test-tools-null: - $(VG) ../fish/guestfish -N part exit - $(VG) ../align/virt-alignment-scan -a test1.img >/dev/null + $(RUN_VG) ../fish/guestfish -N part exit + $(RUN_VG) ../align/virt-alignment-scan -a test1.img >/dev/null rm test1.img - $(VG) ../cat/virt-filesystems -a /dev/null >/dev/null - $(VG) ../cat/virt-filesystems -a /dev/null --all --long -h --uuid >/dev/null - $(VG) ../df/virt-df -a /dev/null >/dev/null - $(VG) ../fish/guestfish -a /dev/null run - $(VG) ../inspector/virt-inspector -a /dev/null >/dev/null - $(VG) ../test-tool/libguestfs-test-tool >/dev/null 2>&1 + $(RUN_VG) ../cat/virt-filesystems -a /dev/null >/dev/null + $(RUN_VG) ../cat/virt-filesystems -a /dev/null --all --long -h --uuid >/dev/null + $(RUN_VG) ../df/virt-df -a /dev/null >/dev/null + $(RUN_VG) ../fish/guestfish -a /dev/null run + $(RUN_VG) ../inspector/virt-inspector -a /dev/null >/dev/null + $(RUN_VG) ../test-tool/libguestfs-test-tool >/dev/null 2>&1 # Invocations of tools on internal images shouldn't leak memory. test-tools-internal: - $(VG) ../cat/virt-cat -a ../images/fedora.img /etc/fstab >/dev/null - $(VG) ../cat/virt-filesystems -a ../images/fedora.img >/dev/null - $(VG) ../cat/virt-filesystems -a ../images/fedora.img --all --long -h --uuid >/dev/null - $(VG) ../cat/virt-ls -a ../images/fedora.img / >/dev/null - $(VG) ../cat/virt-ls -a ../images/fedora.img -l / >/dev/null - $(VG) ../cat/virt-ls -a ../images/fedora.img -R / >/dev/null - $(VG) ../cat/virt-ls -a ../images/fedora.img -lR / >/dev/null - $(VG) ../df/virt-df -a ../images/fedora.img >/dev/null - $(VG) ../df/virt-df -a ../images/fedora.img -h >/dev/null - $(VG) ../fish/guestfish -a ../images/fedora.img run - $(VG) ../fish/guestfish -a ../images/fedora.img -i exit - $(VG) ../inspector/virt-inspector -a ../images/debian.img >/dev/null - $(VG) ../inspector/virt-inspector -a ../images/fedora.img >/dev/null - $(VG) ../inspector/virt-inspector -a ../images/fedora-md1.img -a ../images/fedora-md2.img >/dev/null - $(VG) ../inspector/virt-inspector -a ../images/ubuntu.img >/dev/null - $(VG) ../inspector/virt-inspector -a ../images/windows.img >/dev/null + $(RUN_VG) ../cat/virt-cat -a ../images/fedora.img /etc/fstab >/dev/null + $(RUN_VG) ../cat/virt-filesystems -a ../images/fedora.img >/dev/null + $(RUN_VG) ../cat/virt-filesystems -a ../images/fedora.img --all --long -h --uuid >/dev/null + $(RUN_VG) ../cat/virt-ls -a ../images/fedora.img / >/dev/null + $(RUN_VG) ../cat/virt-ls -a ../images/fedora.img -l / >/dev/null + $(RUN_VG) ../cat/virt-ls -a ../images/fedora.img -R / >/dev/null + $(RUN_VG) ../cat/virt-ls -a ../images/fedora.img -lR / >/dev/null + $(RUN_VG) ../df/virt-df -a ../images/fedora.img >/dev/null + $(RUN_VG) ../df/virt-df -a ../images/fedora.img -h >/dev/null + $(RUN_VG) ../fish/guestfish -a ../images/fedora.img run + $(RUN_VG) ../fish/guestfish -a ../images/fedora.img -i exit + $(RUN_VG) ../inspector/virt-inspector -a ../images/debian.img >/dev/null + $(RUN_VG) ../inspector/virt-inspector -a ../images/fedora.img >/dev/null + $(RUN_VG) ../inspector/virt-inspector -a ../images/fedora-md1.img -a ../images/fedora-md2.img >/dev/null + $(RUN_VG) ../inspector/virt-inspector -a ../images/ubuntu.img >/dev/null + $(RUN_VG) ../inspector/virt-inspector -a ../images/windows.img >/dev/null # Invocations of tools on real images shouldn't leak memory. test-tools-real: - $(VG) virt-df >/dev/null - $(VG) virt-df -h >/dev/null + $(RUN_VG) virt-df >/dev/null + $(RUN_VG) virt-df -h >/dev/null @for g in $(GUESTS); do \ - echo $(VG) ../inspector/virt-inspector -d $$g; \ - $(VG) ../inspector/virt-inspector -d $$g > /dev/null; \ + echo $(RUN_VG) ../inspector/virt-inspector -d $$g; \ + $(RUN_VG) ../inspector/virt-inspector -d $$g > /dev/null; \ r=$$?; \ if [ $$r -ne 0 ]; then exit $$r; fi; \ done @for g in $(GUESTS); do \ - echo $(VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid; \ - $(VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \ + echo $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid; \ + $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \ r=$$?; \ if [ $$r -ne 0 ]; then exit $$r; fi; \ done