From patchwork Thu May 17 17:47:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 136173 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp242770lji; Thu, 17 May 2018 10:54:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpBk1/N0wPsB6lZaUuGSr5gqdNkHkgktEK/FlQoBpah/IM2gJWP0lnwQChOoykq5yz+kifU X-Received: by 2002:ac8:668c:: with SMTP id d12-v6mr6326558qtp.344.1526579683964; Thu, 17 May 2018 10:54:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579683; cv=none; d=google.com; s=arc-20160816; b=0QVncvcaf2IIK9dSXkH7WjuKlLK62NXX63egIU10UdTnsGxxGatJfCzyg3/Q3dlJXc SJ7XfaeG6DtNoqpiILvrG5CIGFtozbRi5p6WsKtDoFbwSbH1N4lE5SCFkC80qrkk8QTk KbBUwpXJrTW0/5kwmvB6/e/jbi/mbukCZJ9yseqCndCtNtcGNMyKFyfR9eMYbf0HjsCY IdLOPJhTxr4/YHqtsYdRUGL2jNTn5orPuR410yxg4o8i/l9e2LQTqw1tjteAlVofh/qR xlmMYW14brM8oVG3J22CZKeaSBguN8mHnWoQ+Y3tBb64RPaLBzbVAwLJR4ZY1FiibqTB 63cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=M5ZPYYfxVFhhSXPSC5GGFFOkGxz9F3Nw4FJW8wr1iR4=; b=k+KGYMISfF7LH4u6ILLDRp6nD0/e7zJ7LljRYrcO3FWMfM43HQDrbkFkzbTXnA0LAY Lj6otIZ7pE7i5Yf+GbTqPSiyFaphy0Ai0xaBMBXcEsa0I6DbqrN9ocIZM1ZZvrHVlnGC KxFEeG2zQ8Wa0/DR+E39wJguQnITw7X6BVDrmC3Bvl1DXlIloLArVzZ+8/ycgUaPzSOK UN1KFcty/7PtW59yW91hD0+AgfeSefVC5FdZ1aAX/OVdGiuqzKeVKh2VloyTIfjXKYlM ntSp84ksBMIKyScbhFlBvolC5YTULkj8TGfSKxRozGLpcfMziwSCaAZVaiP2AsBGBTKR bwlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bgwQfHTz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w13-v6si5544490qto.314.2018.05.17.10.54.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:54:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bgwQfHTz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN6x-0003Sd-Dv for patch@linaro.org; Thu, 17 May 2018 13:54:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN6K-0003Ce-GC for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN6I-00078P-Ij for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:04 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:54801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN6I-00077t-9X for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:02 -0400 Received: by mail-wm0-x241.google.com with SMTP id f6-v6so9925232wmc.4 for ; Thu, 17 May 2018 10:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M5ZPYYfxVFhhSXPSC5GGFFOkGxz9F3Nw4FJW8wr1iR4=; b=bgwQfHTz+RI5W6hyAFwF+UND3J3AgXu5ya6IC/9r4YUjgcv0zaVcRgaWdrvoKePayA bUleWKLmWN1j5+t3amBSIEFznZJNxEdONwz0MbEkK9S4lO5VFaUdaHuLg8DAaw9YWsOO 7HLNVuSqYJjkToYa1JadPLBbsJJ12asNLpG5Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M5ZPYYfxVFhhSXPSC5GGFFOkGxz9F3Nw4FJW8wr1iR4=; b=HffEQYbnJ4ZObTIcgR7YILX0HhgWG6uWM64T3SZ9JZnraCLkvGdJ/BQAg5JXFLOrLj 7U44Gh/1R+2GeMkx4ie56P5y5KsbBw9bA7xpsUMkAHgxcbpGpH3rzQagA2hU6J4qNP+I uCt+2r7+0gR7U3mGSJ4+CKmWE2Kh4Gw4HYA3uBr8i9XSjUXaCqgjZ/gYCbsnBlbJNhjU UO0tK6SXpUtxJyALmcBAZ9N/nngzBXBCGdvQVKpr3DrNI9U0YJrq3CPTmfWeD29HeyLS KfTnIMmgtCBfoFlTIkAQC99nsDh/8vUdleVPRlPgdB2QeCkNB5GJulU8i3e+/j4AYq1P dkDw== X-Gm-Message-State: ALKqPwdvQ7g+EUwOyiPPtDY3FePPrPqt9YMFYGFDIva0/+8DTBqgjPhb w5HePs5hhAlnzthYAvj8WIQWV4rh/ts= X-Received: by 2002:a1c:6741:: with SMTP id b62-v6mr2489218wmc.0.1526579640966; Thu, 17 May 2018 10:54:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 38-v6sm10621106wry.61.2018.05.17.10.53.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:53:57 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id ABA743E0FAA; Thu, 17 May 2018 18:47:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Thu, 17 May 2018 18:47:15 +0100 Message-Id: <20180517174718.10107-47-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v4 46/49] tests/tcg/Makefile: update to be called from Makefile.target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This make is now invoked from each individual target make with the appropriate CC and EXTRA_CFLAGS set for each guest. It then includes additional Makefile.targets from: - tests/tcg/multiarch (always) - tests/tcg/$(TARGET_BASE_ARCH) (if available) - tests/tcg/$(TARGET_NAME) The order is important as the later Makefile's may want to suppress TESTS from its base arch profile. Each included Makefile.target is responsible for adding TESTS as well as defining any special build instructions for individual tests. Signed-off-by: Alex Bennée --- v2 - cleaner approach to include sub makefiles - move TESTS/VPATH manipulation into sub-makefile - avoid double inclusion when TARGET_BASE_ARCH==TARGET_NAME v4 - add timeout to default runner - clean-up comments about build flags - update to handle BUILD_STATIC - add MAINTAINERS entry --- MAINTAINERS | 5 ++ tests/tcg/Makefile | 177 ++++++++++++++++++--------------------------- 2 files changed, 74 insertions(+), 108 deletions(-) -- 2.17.0 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/MAINTAINERS b/MAINTAINERS index ee7f101890..ae569f9cf6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2107,6 +2107,11 @@ W: https://travis-ci.org/qemu/qemu W: https://app.shippable.com/github/qemu/qemu W: http://patchew.org/QEMU/ +Guest Test Compilation Support +M: Alex Bennée +F: tests/tcg/Makefile +L: qemu-devel@nongnu.org + Documentation ------------- Build system architecture diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index e12395117a..f2dcfc730a 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -1,125 +1,86 @@ +# -*- Mode: makefile -*- +# +# TCG tests +# +# These are complicated by the fact we want to build them for guest +# systems. This requires knowing what guests we are building and which +# ones we have cross-compilers for or docker images with +# cross-compilers. +# +# The tests themselves should be as minimal as possible as +# cross-compilers don't always have a large amount of libraries +# available. +# +# We only include the host build system for SRC_PATH and we don't +# bother with the common rules.mk. We expect the following: +# +# CC - the C compiler command +# EXTRA_CFLAGS - any extra CFLAGS +# BUILD_STATIC - are we building static binaries +# +# By default all tests are statically compiled but some host systems +# may not package static libraries by default. If an external +# cross-compiler can only build dynamic libraries the user might need +# to make extra efforts to ensure ld.so can link at runtime when the +# tests are run. +# +# We also accept SPEED=slow to enable slower running tests +# +# We also expect to be in the tests build dir for the FOO-linux-user. +# + -include ../../config-host.mak --include $(SRC_PATH)/rules.mak +-include ../config-target.mak -$(call set-vpath, $(SRC_PATH)/tests/tcg) +quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -QEMU=../../i386-linux-user/qemu-i386 -QEMU_X86_64=../../x86_64-linux-user/qemu-x86_64 -CC_X86_64=$(CC_I386) -m64 +# Tests we are building +TESTS= -QEMU_INCLUDES += -I../.. -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -#CFLAGS+=-msse2 +# Start with a blank slate, the build targets get to add stuff first +CFLAGS= +QEMU_CFLAGS= LDFLAGS= -# TODO: automatically detect ARM and MIPS compilers, and run those too - -# runcom maps page 0, so it requires root privileges -# also, pi_10.com runs indefinitely - -I386_TESTS=hello-i386 \ - sha1-i386 \ - test-i386 \ - test-i386-fprem \ - # runcom +# The QEMU for this TARGET +QEMU=../qemu-$(TARGET_NAME) +TIMEOUT=15 -# native i386 compilers sometimes are not biarch. assume cross-compilers are -ifneq ($(ARCH),i386) -I386_TESTS+=run-test-x86_64 +# The order we include is important. We include multiarch, base arch +# and finally arch if it's not the same as base arch. +-include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target +ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target endif -TESTS = test_path -ifneq ($(call find-in-path, $(CC_I386)),) -TESTS += $(I386_TESTS) +# Add the common build options +CFLAGS+=-Wall -O0 -g -fno-strict-aliasing +ifeq ($(BUILD_STATIC),y) +LDFLAGS+=-static endif -all: $(patsubst %,run-%,$(TESTS)) -test: all - -# rules to run tests - -.PHONY: $(patsubst %,run-%,$(TESTS)) - -run-%: % - -$(QEMU) ./$* - -run-hello-i386: hello-i386 -run-sha1-i386: sha1-i386 - -run-test-i386: test-i386 - ./test-i386 > test-i386.ref - -$(QEMU) test-i386 > test-i386.out - @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi - -run-test-i386-fprem: test-i386-fprem - ./test-i386-fprem > test-i386-fprem.ref - -$(QEMU) test-i386-fprem > test-i386-fprem.out - @if diff -u test-i386-fprem.ref test-i386-fprem.out ; then echo "Auto Test OK"; fi - -run-test-x86_64: test-x86_64 - ./test-x86_64 > test-x86_64.ref - -$(QEMU_X86_64) test-x86_64 > test-x86_64.out - @if diff -u test-x86_64.ref test-x86_64.out ; then echo "Auto Test OK"; fi - +%: %.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -run-runcom: runcom - -$(QEMU) ./runcom $(SRC_PATH)/tests/pi_10.com +all: $(TESTS) -run-test_path: test_path - ./test_path +# +# Test Runners +# +# By default we just run the test with the appropriate QEMU for the +# target. More advanced tests may want to override the runner in their +# specific make rules. +# -# rules to compile tests +RUN_TESTS=$(patsubst %,run-%, $(TESTS)) -hello-i386: hello-i386.c - $(CC_I386) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $< - strip $@ - -# i386/x86_64 emulation test (test various opcodes) */ -test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S \ - test-i386.h test-i386-shift.h test-i386-muldiv.h - $(CC_I386) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ \ - $( $<.out, \ + "TEST", "$< on $(TARGET_NAME)") -# testsuite for the LM32 port. -test-lm32: - $(MAKE) -C lm32 check +.PHONY: run +run: $(RUN_TESTS) -clean: - rm -f *~ *.o test-i386.out test-i386.ref \ - test-x86_64.log test-x86_64.ref qruncom $(TESTS) +# There is no clean target, the calling make just rm's the tests build dir