[PULL,29/52] tests/tcg: clean-up VPATH/TESTS for i386

Message ID	20190607090552.12434-30-alex.bennee@linaro.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Fri, 7 Jun 2019 10:05:28 +0100 Message-Id: <20190607090552.12434-30-alex.bennee@linaro.org> In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org> References: <20190607090552.12434-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386 Precedence: list Cc: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>, Richard Henderson <rth@twiddle.net> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/52] editorconfig: add setting for shell scripts \| expand [PULL,01/52] editorconfig: add setting for shell scripts [PULL,02/52] qemu-io-cmds: use clock_gettime for benchmarking [PULL,03/52] tests/docker: Update the Fedora image to Fedora 30 [PULL,04/52] tests/docker: Update the Fedora cross compile images to 30 [PULL,05/52] tests/docker: Update the Ubuntu image to 19.04 [PULL,06/52] .travis.yml: bump gcc sanitiser job to gcc-9 [PULL,07/52] .travis.yml: add clang ubsan job [PULL,08/52] tests/vm: Use python configured on build [PULL,09/52] tests/vm: Port basevm to Python 3 [PULL,10/52] tests/vm: Fix build-centos docker-based tests run [PULL,11/52] tests/vm: Add missing variables on help [PULL,12/52] scripts: use git archive in archive-source [PULL,13/52] tests/vm: python3 fixes [PULL,14/52] tests/vm: send proxy environment variables over ssh [PULL,15/52] tests/vm: use ssh with pty unconditionally [PULL,16/52] tests/vm: run test builds on snapshot [PULL,17/52] tests/vm: proper guest shutdown [PULL,18/52] tests/vm: add vm-boot-{ssh, serial}-<guest> targets [PULL,19/52] tests/vm: add DEBUG=1 to help text [PULL,20/52] tests/vm: serial console support helpers [PULL,21/52] tests/vm: openbsd autoinstall, using serial console [PULL,22/52] tests/vm: freebsd autoinstall, using serial console [PULL,23/52] tests/vm: netbsd autoinstall, using serial console [PULL,24/52] tests/vm: fedora autoinstall, using serial console [PULL,25/52] tests/vm: ubuntu.i386: apt proxy setup [PULL,26/52] semihosting: split console_out into string and char versions [PULL,27/52] cputlb: use uint64_t for interim values for unaligned load [PULL,28/52] tests/tcg: better detect truncated reads [PULL,29/52] tests/tcg: clean-up VPATH/TESTS for i386 [PULL,30/52] tests/tcg/x86_64: add a PVH crt.o for x86_64 system tests [PULL,31/52] MAINTAINERS: put myself forward for gdbstub [PULL,32/52] cputlb: cast size_t to target_ulong before using for address masks [PULL,33/52] gdbstub: Add infrastructure to parse cmd packets [PULL,34/52] gdbstub: Implement deatch (D pkt) with new infra [PULL,35/52] gdbstub: Implement thread_alive (T pkt) with new infra [PULL,36/52] gdbstub: Implement continue (c pkt) with new infra [PULL,37/52] gdbstub: Implement continue with signal (C pkt) with new infra [PULL,38/52] gdbstub: Implement set_thread (H pkt) with new infra [PULL,39/52] gdbstub: Implement breakpoint commands (Z/z pkt) with new infra [PULL,40/52] gdbstub: Implement set register (P pkt) with new infra [PULL,41/52] gdbstub: Implement get register (p pkt) with new infra [PULL,42/52] gdbstub: Implement write memory (M pkt) with new infra [PULL,43/52] gdbstub: Implement read memory (m pkt) with new infra [PULL,44/52] gdbstub: Implement write all registers (G pkt) with new infra [PULL,45/52] gdbstub: Implement read all registers (g pkt) with new infra [PULL,46/52] gdbstub: Implement file io (F pkt) with new infra [PULL,47/52] gdbstub: Implement step (s pkt) with new infra [PULL,48/52] gdbstub: Implement v commands with new infra [PULL,49/52] gdbstub: Implement generic set/query (Q/q pkt) with new infra [PULL,50/52] gdbstub: Implement target halted (? pkt) with new infra [PULL,51/52] gdbstub: Clear unused variables in gdb_handle_packet [PULL,52/52] gdbstub: Implement qemu physical memory mode

Message ID

20190607090552.12434-30-alex.bennee@linaro.org (mailing list archive)

State

New, archived

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Fri,  7 Jun 2019 10:05:28 +0100
Message-Id: <20190607090552.12434-30-alex.bennee@linaro.org>
In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org>
References: <20190607090552.12434-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386
Precedence: list
Cc: Paolo Bonzini <pbonzini@redhat.com>,
 =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org,
 Eduardo Habkost <ehabkost@redhat.com>, Richard Henderson <rth@twiddle.net>
Errors-To: 
 qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org
Sender: "Qemu-devel"
 <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>

Series

[PULL,01/52] editorconfig: add setting for shell scripts | expand

Commit Message

Alex Bennée June 7, 2019, 9:05 a.m. UTC

Since we only run build the multiarch tests and we use a fully
resolved path for the crt object we don't need the wildcard or VPATH
messing about.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target
index e1f98177aa..e1d880f9b5 100644
--- a/tests/tcg/i386/Makefile.softmmu-target
+++ b/tests/tcg/i386/Makefile.softmmu-target
@@ -8,15 +8,10 @@ 
 
 I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system
 X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system
-# Set search path for all sources
-VPATH+=$(I386_SYSTEM_SRC)
 
 # These objects provide the basic boot code and helper functions for all tests
 CRT_OBJS=boot.o
 
-X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c)
-X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS))
-
 ifeq ($(TARGET_X86_64), y)
 CRT_PATH=$(X64_SYSTEM_SRC)
 LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld
@@ -26,12 +21,12 @@  CRT_PATH=$(I386_SYSTEM_SRC)
 CFLAGS+=-m32
 LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld
 LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386
-# FIXME: move to common once x86_64 is bootstrapped
-TESTS+=$(X86_TESTS) $(MULTIARCH_TESTS)
 endif
 CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC)
 LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
 
+TESTS+=$(MULTIARCH_TESTS)
+
 # building head blobs
 .PRECIOUS: $(CRT_OBJS)

[PULL,29/52] tests/tcg: clean-up VPATH/TESTS for i386

Commit Message

Patch