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

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386
Date: Fri,  7 Jun 2019 10:05:28 +0100	[thread overview]
Message-ID: <20190607090552.12434-30-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org>

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)
 
-- 
2.20.1

next prev parent reply	other threads:[~2019-06-07  9:51 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-07  9:04 [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 01/52] editorconfig: add setting for shell scripts Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 02/52] qemu-io-cmds: use clock_gettime for benchmarking Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 03/52] tests/docker: Update the Fedora image to Fedora 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 04/52] tests/docker: Update the Fedora cross compile images to 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 05/52] tests/docker: Update the Ubuntu image to 19.04 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 06/52] .travis.yml: bump gcc sanitiser job to gcc-9 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 07/52] .travis.yml: add clang ubsan job Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 08/52] tests/vm: Use python configured on build Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 10/52] tests/vm: Fix build-centos docker-based tests run Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 11/52] tests/vm: Add missing variables on help Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 12/52] scripts: use git archive in archive-source Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 13/52] tests/vm: python3 fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 14/52] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 15/52] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 16/52] tests/vm: run test builds on snapshot Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 17/52] tests/vm: proper guest shutdown Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 18/52] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 19/52] tests/vm: add DEBUG=1 to help text Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 20/52] tests/vm: serial console support helpers Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 21/52] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 22/52] tests/vm: freebsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 23/52] tests/vm: netbsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 24/52] tests/vm: fedora " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 25/52] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 26/52] semihosting: split console_out into string and char versions Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 27/52] cputlb: use uint64_t for interim values for unaligned load Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 28/52] tests/tcg: better detect truncated reads Alex Bennée
2019-06-07  9:05 ` Alex Bennée [this message]
2019-06-07  9:05 ` [Qemu-devel] [PULL 30/52] tests/tcg/x86_64: add a PVH crt.o for x86_64 system tests Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 31/52] MAINTAINERS: put myself forward for gdbstub Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 32/52] cputlb: cast size_t to target_ulong before using for address masks Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 33/52] gdbstub: Add infrastructure to parse cmd packets Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 34/52] gdbstub: Implement deatch (D pkt) with new infra Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 35/52] gdbstub: Implement thread_alive (T " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 36/52] gdbstub: Implement continue (c " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 37/52] gdbstub: Implement continue with signal (C " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 38/52] gdbstub: Implement set_thread (H " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 39/52] gdbstub: Implement breakpoint commands (Z/z " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 40/52] gdbstub: Implement set register (P " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 41/52] gdbstub: Implement get register (p " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 42/52] gdbstub: Implement write memory (M " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 43/52] gdbstub: Implement read memory (m " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 44/52] gdbstub: Implement write all registers (G " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 45/52] gdbstub: Implement read all registers (g " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 46/52] gdbstub: Implement file io (F " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 47/52] gdbstub: Implement step (s " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 48/52] gdbstub: Implement v commands " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 49/52] gdbstub: Implement generic set/query (Q/q pkt) " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 50/52] gdbstub: Implement target halted (? " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 51/52] gdbstub: Clear unused variables in gdb_handle_packet Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 52/52] gdbstub: Implement qemu physical memory mode Alex Bennée
2019-06-07  9:50 ` [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Peter Maydell
2019-06-07 13:25   ` Alex Bennée
2019-06-11 14:18   ` Alex Bennée

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e1f98177a dfblob:e1d880f9b )
 OR (
bs:"[Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190607090552.12434-30-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=ehabkost@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).