On 07/08/19 14:40, Alex Bennée wrote:
>
> Paolo Bonzini <pbonz...@redhat.com> writes:
>
>> The tests/tcg rely a lot on per-target informations from
>> the QEMU makefiles, but most of the definitions in there
>> aren't really relevant to TCG tests.
>>
>> This series is just a cleanup, but it could also be
>> a useful start in making it possible to compile tests/tcg
>> out of QEMU's tree, and/or making it a submodule, and/or
>> unifying the system emulation tests with kvm-unit-tests.
>
> Hmm something is throwing off configure and making it use my login shell
> instead of /bin/sh:
>
> libpmem support no
> libudev yes
> default devices yes
> ~/lsrc/qemu.git/tests/tcg/configure.sh (line 63): 'case' builtin not inside
> of switch block
> case $arch in
> ^
> <W> fish: Error while reading file
> /home/alex/lsrc/qemu.git/tests/tcg/configure.sh
It's the ${SHELL} you found in patch 3. The disadvantage of relying on
#! is that some people have bash in /usr/bin/bash rather than /bin/bash.
But we already assume /bin/bash elsewhere so I can drop it.
Paolo
>>
>> Paolo
>>
>> Paolo Bonzini (3):
>> tests/tcg: use EXTRA_CFLAGS everywhere
>> tests/tcg: cleanup Makefile inclusions
>> tests/tcg: move configuration to a sub-shell script
>>
>> Makefile | 1 +
>> Makefile.target | 3 -
>> configure | 155 ++------------------
>> tests/Makefile.include | 25 ++--
>> tests/tcg/Makefile.include | 88 ------------
>> tests/tcg/Makefile.prereqs | 18 +++
>> tests/tcg/Makefile.probe | 31 ----
>> tests/tcg/Makefile.qemu | 95 +++++++++++++
>> tests/tcg/{Makefile => Makefile.target} | 15 +-
>> tests/tcg/aarch64/Makefile.include | 8 --
>> tests/tcg/aarch64/Makefile.softmmu-target | 4 +-
>> tests/tcg/aarch64/Makefile.target | 12 +-
>> tests/tcg/alpha/Makefile.include | 2 -
>> tests/tcg/alpha/Makefile.softmmu-target | 4 +-
>> tests/tcg/arm/Makefile.include | 8 --
>> tests/tcg/arm/Makefile.softmmu-target | 6 +-
>> tests/tcg/configure.sh | 228
>> ++++++++++++++++++++++++++++++
>> tests/tcg/cris/Makefile.include | 6 -
>> tests/tcg/hppa/Makefile.include | 2 -
>> tests/tcg/i386/Makefile.include | 9 --
>> tests/tcg/i386/Makefile.softmmu-target | 12 +-
>> tests/tcg/i386/Makefile.target | 13 +-
>> tests/tcg/m68k/Makefile.include | 2 -
>> tests/tcg/minilib/Makefile.target | 2 +-
>> tests/tcg/mips/Makefile.include | 20 ---
>> tests/tcg/ppc/Makefile.include | 10 --
>> tests/tcg/riscv/Makefile.include | 10 --
>> tests/tcg/s390x/Makefile.include | 2 -
>> tests/tcg/sh4/Makefile.include | 4 -
>> tests/tcg/sparc64/Makefile.include | 2 -
>> tests/tcg/x86_64/Makefile.softmmu-target | 36 +++++
>> tests/tcg/x86_64/Makefile.target | 7 +-
>> tests/tcg/xtensa/Makefile.include | 11 --
>> tests/tcg/xtensa/Makefile.softmmu-target | 4 +-
>> 34 files changed, 435 insertions(+), 420 deletions(-)
>> delete mode 100644 tests/tcg/Makefile.include
>> create mode 100644 tests/tcg/Makefile.prereqs
>> delete mode 100644 tests/tcg/Makefile.probe
>> create mode 100644 tests/tcg/Makefile.qemu
>> rename tests/tcg/{Makefile => Makefile.target} (90%)
>> delete mode 100644 tests/tcg/aarch64/Makefile.include
>> delete mode 100644 tests/tcg/alpha/Makefile.include
>> delete mode 100644 tests/tcg/arm/Makefile.include
>> create mode 100644 tests/tcg/configure.sh
>> delete mode 100644 tests/tcg/cris/Makefile.include
>> delete mode 100644 tests/tcg/hppa/Makefile.include
>> delete mode 100644 tests/tcg/i386/Makefile.include
>> delete mode 100644 tests/tcg/m68k/Makefile.include
>> delete mode 100644 tests/tcg/mips/Makefile.include
>> delete mode 100644 tests/tcg/ppc/Makefile.include
>> delete mode 100644 tests/tcg/riscv/Makefile.include
>> delete mode 100644 tests/tcg/s390x/Makefile.include
>> delete mode 100644 tests/tcg/sh4/Makefile.include
>> delete mode 100644 tests/tcg/sparc64/Makefile.include
>> create mode 100644 tests/tcg/x86_64/Makefile.softmmu-target
>> delete mode 100644 tests/tcg/xtensa/Makefile.include
>
>
> --
> Alex Bennée
>
