| Message ID | 52FD9583.6080005@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
On 02/14/2014 03:03 PM, Alexey Kardashevskiy wrote: > On 02/11/2014 07:32 AM, Andreas Färber wrote: >> Am 10.02.2014 04:52, schrieb Alexey Kardashevskiy: >>> This adds $(check-qtest-ppc64-y) to the check-clean rule. >>> >>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> >> >> Nice catch! >> >>> --- >>> tests/Makefile | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/tests/Makefile b/tests/Makefile >>> index 0aaf657..3a00ea7 100644 >>> --- a/tests/Makefile >>> +++ b/tests/Makefile >>> @@ -319,7 +319,7 @@ check-block: $(patsubst %,check-%, $(check-block-y)) >>> check: check-qapi-schema check-unit check-qtest >>> check-clean: >>> $(MAKE) -C tests/tcg clean >>> - rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >>> + rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) $(check-qtest-ppc64-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >>> >>> clean: check-clean >>> >> >> Can we use a $(foreach ...) for $(check-qtest-*-y) like Peter did for >> adding qom-test? >> >> http://patchwork.ozlabs.org/patch/313650/ > > Like this? Against what should I rebase my patches and repost them? Ping? > > diff --git a/tests/Makefile b/tests/Makefile > index 94b32b7..2577843 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -323,7 +323,9 @@ check-block: $(patsubst %,check-%, $(check-block-y)) > check: check-qapi-schema check-unit check-qtest > check-clean: > $(MAKE) -C tests/tcg clean > - rm -rf $(check-unit-y) $(check-qtest-i386-y) > $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) t > + $(eval rmlist = $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)) > + $(foreach target,$(SYSEMU_TARGET_LIST), $(eval rmlist += > $(check-qtest-$(target)-y))) > + rm -rf $(rmlist) > > clean: check-clean > > >
Am 14.02.2014 05:03, schrieb Alexey Kardashevskiy: > On 02/11/2014 07:32 AM, Andreas Färber wrote: >> Am 10.02.2014 04:52, schrieb Alexey Kardashevskiy: >>> This adds $(check-qtest-ppc64-y) to the check-clean rule. >>> >>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> >> >> Nice catch! >> >>> --- >>> tests/Makefile | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/tests/Makefile b/tests/Makefile >>> index 0aaf657..3a00ea7 100644 >>> --- a/tests/Makefile >>> +++ b/tests/Makefile >>> @@ -319,7 +319,7 @@ check-block: $(patsubst %,check-%, $(check-block-y)) >>> check: check-qapi-schema check-unit check-qtest >>> check-clean: >>> $(MAKE) -C tests/tcg clean >>> - rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >>> + rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) $(check-qtest-ppc64-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >>> >>> clean: check-clean >>> >> >> Can we use a $(foreach ...) for $(check-qtest-*-y) like Peter did for >> adding qom-test? >> >> http://patchwork.ozlabs.org/patch/313650/ > > Like this? Maybe. Waiting for review from Peter (who did the foreach for qom-test) or anyone. > Against what should I rebase my patches and repost them? Sorry, didn't see this question... Pushed a new working branch: https://github.com/afaerber/qemu-cpu/commits/qtest Some more tests were already pulled in, queue for upstream is: https://github.com/afaerber/qemu-cpu/commits/qom-next Regards, Andreas > diff --git a/tests/Makefile b/tests/Makefile > index 94b32b7..2577843 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -323,7 +323,9 @@ check-block: $(patsubst %,check-%, $(check-block-y)) > check: check-qapi-schema check-unit check-qtest > check-clean: > $(MAKE) -C tests/tcg clean > - rm -rf $(check-unit-y) $(check-qtest-i386-y) > $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) t > + $(eval rmlist = $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)) > + $(foreach target,$(SYSEMU_TARGET_LIST), $(eval rmlist += > $(check-qtest-$(target)-y))) > + rm -rf $(rmlist) > > clean: check-clean >
On 14 February 2014 04:03, Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > Like this? Against what should I rebase my patches and repost them? > > > diff --git a/tests/Makefile b/tests/Makefile > index 94b32b7..2577843 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -323,7 +323,9 @@ check-block: $(patsubst %,check-%, $(check-block-y)) > check: check-qapi-schema check-unit check-qtest > check-clean: > $(MAKE) -C tests/tcg clean > - rm -rf $(check-unit-y) $(check-qtest-i386-y) > $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) t > + $(eval rmlist = $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)) > + $(foreach target,$(SYSEMU_TARGET_LIST), $(eval rmlist += > $(check-qtest-$(target)-y))) > + rm -rf $(rmlist) You don't need this intermediate rmlist variable. It should be possible to do something like rm -rf $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) (untested!) thanks -- PMM
diff --git a/tests/Makefile b/tests/Makefile index 94b32b7..2577843 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -323,7 +323,9 @@ check-block: $(patsubst %,check-%, $(check-block-y)) check: check-qapi-schema check-unit check-qtest check-clean: $(MAKE) -C tests/tcg clean - rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) t + $(eval rmlist = $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)) + $(foreach target,$(SYSEMU_TARGET_LIST), $(eval rmlist += $(check-qtest-$(target)-y))) + rm -rf $(rmlist)