From d05b16d79fab5d07ee4b5d128768fdc5acee2de7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 Nov 2011 17:22:56 +0000 Subject: [PATCH] extra tests: Split up and reorder tests more logically. (cherry picked from commit cee513112adcf4084d6be9e3b5037b7b54c9f514) --- extratests/Makefile.am | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/extratests/Makefile.am b/extratests/Makefile.am index dff74b6..74a85dd 100644 --- a/extratests/Makefile.am +++ b/extratests/Makefile.am @@ -43,13 +43,15 @@ GUESTS = $(shell virsh -c $(LIBVIRT_DEFAULT_URI) list --all | \ awk '{print $$2}') extra-tests: \ + test-capitests \ test-tools-null \ test-tools-internal \ - test-tools-real \ + test-df-real \ + test-filesystems-real \ + test-inspector-real \ + test-ocaml \ test-resize \ - test-sparsify \ - test-capitests \ - test-ocaml + test-sparsify # Null invocations of the basic tools shouldn't leak memory. test-tools-null: @@ -82,18 +84,22 @@ test-tools-internal: $(RUN_VG) ../inspector/virt-inspector -a ../images/windows.img >/dev/null # Invocations of tools on real images shouldn't leak memory. -test-tools-real: +test-df-real: $(RUN_VG) virt-df >/dev/null $(RUN_VG) virt-df -h >/dev/null + +test-filesystems-real: @for g in $(GUESTS); do \ - echo $(RUN_VG) ../inspector/virt-inspector -d $$g; \ - $(RUN_VG) ../inspector/virt-inspector -d $$g > /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 + +test-inspector-real: @for g in $(GUESTS); do \ - 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; \ + 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 -- 1.8.3.1