[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PULL 12/30] Makefile: Remove generated files when doing 'distclean'
|
From: |
Paolo Bonzini |
|
Subject: |
Re: [PULL 12/30] Makefile: Remove generated files when doing 'distclean' |
|
Date: |
Fri, 4 Oct 2019 18:48:47 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 |
On 04/10/19 14:20, Peter Maydell wrote:
> On Wed, 2 Oct 2019 at 18:07, Paolo Bonzini <address@hidden> wrote:
>>
>> From: Thomas Huth <address@hidden>
>>
>> When running "make distclean" we currently leave a lot of generated
>> files in the build directory. Fix that.
>>
>> Signed-off-by: Thomas Huth <address@hidden>
>> Reviewed-by: John Snow <address@hidden>
>> Signed-off-by: Paolo Bonzini <address@hidden>
>> ---
>
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 3543451..48b52da 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -1176,11 +1176,21 @@ check: check-block check-qapi-schema check-unit
>> check-softfloat check-qtest chec
>> check-clean:
>> rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
>> rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST),
>> $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
>> - rm -f tests/test-qapi-gen-timestamp
>> rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
>> + rm -f tests/qemu-iotests/common.env tests/qemu-iotests/check.*
>> + rm -f tests/test-qapi-gen-timestamp tests/qht-bench$(EXESUF) \
>> + tests/fp/fp-test tests/fp/*.out tests/qapi-schema/*.test.*
>>
>> clean: check-clean
>
> Hi; this change breaks the sequence
> 'make clean; make; make check'
>
> because now 'make clean' removes tests/qemu-iotests/common.env.
> But this file is created by 'configure', not by 'make', so if there's
> no other reason why 'make' needs to re-run configure then we get
> to the 'make check' stage with the file not existing, and then
> when we try to run the iotests they fail with:
>
> ./check: line 60:
> /home/petmay01/linaro/qemu-for-merges/build/alldbg/tests/qemu-iotests/common.env:
> No such file or directory
> check: failed to source common.env (make sure the qemu-iotests are run
> from tests/qemu-iotests in the build tree)
> /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:1102:
> recipe for target 'check-tests/check-block.sh' failed
>
> thanks
> -- PMM
>
I've dropped this patch and will send v3 that adds back the VMX patches.
Paolo
- [PULL 04/30] target/i386: expand feature words to 64 bits, (continued)
- [PULL 04/30] target/i386: expand feature words to 64 bits, Paolo Bonzini, 2019/10/02
- [PULL 06/30] vmxcap: correct the name of the variables, Paolo Bonzini, 2019/10/02
- [PULL 08/30] target/i386: work around KVM_GET_MSRS bug for secondary execution controls, Paolo Bonzini, 2019/10/02
- [PULL 05/30] target/i386: add VMX definitions, Paolo Bonzini, 2019/10/02
- [PULL 10/30] qemu-pr-helper: fix crash in mpath_reconstruct_sense, Paolo Bonzini, 2019/10/02
- [PULL 11/30] replay: don't synchronize memory operations in replay mode, Paolo Bonzini, 2019/10/02
- [PULL 07/30] target/i386: add VMX features, Paolo Bonzini, 2019/10/02
- [PULL 09/30] target/i386/kvm: Silence warning from Valgrind about uninitialized bytes, Paolo Bonzini, 2019/10/02
- [PULL 12/30] Makefile: Remove generated files when doing 'distclean', Paolo Bonzini, 2019/10/02
[PULL 13/30] hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c, Paolo Bonzini, 2019/10/02
[PULL 14/30] ide: fix leak from qemu_allocate_irqs, Paolo Bonzini, 2019/10/02
[PULL 16/30] mcf5208: fix leak from qemu_allocate_irqs, Paolo Bonzini, 2019/10/02
[PULL 15/30] microblaze: fix leak of fdevice tree blob, Paolo Bonzini, 2019/10/02
[PULL 17/30] hppa: fix leak from g_strdup_printf, Paolo Bonzini, 2019/10/02
[PULL 18/30] mips: fix memory leaks in board initialization, Paolo Bonzini, 2019/10/02
[PULL 20/30] lm32: do not leak memory on object_new/object_unref, Paolo Bonzini, 2019/10/02
[PULL 21/30] docker: test-debug: disable LeakSanitizer, Paolo Bonzini, 2019/10/02