From patchwork Tue Apr 24 15:23:35 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: 134145 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2441382lji; Tue, 24 Apr 2018 09:27:22 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr2zMeFL9Mhwzpt/RvsIIu6YqsA6PbN9cvCLuiao+3FV/C1gZXJI/P/7scrCZb5nsSQX5Ln X-Received: by 2002:ac8:90b:: with SMTP id t11-v6mr28270972qth.107.1524587242470; Tue, 24 Apr 2018 09:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524587242; cv=none; d=google.com; s=arc-20160816; b=vwGy8J4gUP1Myfd2YL7RxKunxhzTqdvlYWX2r1X359Lad7HgXD8vBO/I5QswAxLMcu soMw/rMZMsdmWGgjOaQLzCo9cF4/NiXLopXaINkvt4wODfZFtescbqNA6Q4tHzt3Zai+ CU06QMcqa+BuLcvIo7zeUXQUianRyn21b0Hnp5MiNUYG9bFferwKBbKWPd7BzAxslEJL BuHYjqd3b9BNnSsAss/9qmNKAHTXseOM3YHY/jFfReIL1G5bX0L7UD0rhpN00QGsm+R4 wI0OaEqd/xigoLQ6VFQLaLCdObloKUWRXKBE2leBoi1F8T2Wv8eFg9nErr2SeCu24bDh B4sw== 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=flypIEKkCYHfJd0HmJGs/yHA6xC+HQqzKclPb3K9yGo=; b=PhE3XIBAOuAMf2fYpyxlLvnsJkJsyMu8Rg4t2v6242ohjEtdFMie5N6Fuw+yKBCEAC ehqGj4lF4yIZuxcx+R+sVRicLPv8HBOWTgpPqH5UN1ZYPoKCTrGTGA8O7pwQaGzDI/4D vF2qyQkjIbBa1JH8OMkyhDbDPHR1g4IdwPHcmEJLB/B+oNTGBbMkAzO6FAsYHpxdTNrB gX1AX5yrY5vPcTEDln0dD/jePMweW8wP89hr+J4+Ir1Rjc9fn/bGPv/cb4cw1Ni94Imy Q2gsx8qZfvg9JbQpVFz/p63pwvTyfCeaIXg+ZpdWnsKbLuOjM9oDtKakGKiRbJhheKjX 0lqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BPhJoZ9W; 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 e12si18259466qkm.60.2018.04.24.09.27.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 09:27:22 -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=BPhJoZ9W; 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]:59498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB0mn-0006Co-Po for patch@linaro.org; Tue, 24 Apr 2018 12:27:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzwV-0005z5-0g for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzwT-0001Vu-IQ for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:19 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:37748) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAzwT-0001UN-97 for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:17 -0400 Received: by mail-wm0-x244.google.com with SMTP id l16so1614540wmh.2 for ; Tue, 24 Apr 2018 08:33:17 -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=flypIEKkCYHfJd0HmJGs/yHA6xC+HQqzKclPb3K9yGo=; b=BPhJoZ9WMln3oKctl4ZdYhzDy+KLs/1SSWbDy07FY1NeJPlJPCcIbp4YuAHwxSEswg Meohk0o13rHxD+h95qd0ZG3A11Xu/LYBc7QmOAOc00cbv+c2SXY3Uuo9sgYgrjRbwSv/ fX9+fxbt4dCN0D7lTorGl2MQYkLKez5Xjpbf0= 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=flypIEKkCYHfJd0HmJGs/yHA6xC+HQqzKclPb3K9yGo=; b=jGRrT4/WQT9p95RL5gtkqRlaw7grT3Unle7zrD1yE5NRFhWrQa84K+q48csfXJRtr0 AMIogJBsifR76/DKy/8Mp4UCzJHUeWmkXOpB1Dgbf8FMdSfUmrM3gVNPXg6xQApvgeN2 PpTqhmr5X/v5qPRkAt+XLXatsWESh9SuQ9LAyKJFiY4aC7++mmEo/Twxv1wmTfRdHrG3 rUcZFVPKB9y+NYf8MkmxI+UUQquz3m1LHoD1peobp+54hdxZpAqlwUg4nboHgL5Fv2Pu SkfhzP8vlCbXkpeHRT39dEnD67tXCDmfZF8h/47Ya4pJlQUeLyWuvvaO3go3aNzbM7++ CUYQ== X-Gm-Message-State: ALQs6tAnFw4SgBJTyOHrRu06ZdtOWU1EAQyb9n2RlDYUMImvtKmszng8 6/fVu9IGqzDP3Kh2ikE1N1taGw== X-Received: by 10.28.12.129 with SMTP id 123mr12308933wmm.75.1524583996052; Tue, 24 Apr 2018 08:33:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 80sm15430421wmk.46.2018.04.24.08.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:33:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A1B9E3E0AC0; Tue, 24 Apr 2018 16:24:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, 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: Tue, 24 Apr 2018 16:23:35 +0100 Message-Id: <20180424152405.10304-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-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::244 Subject: [Qemu-devel] [PATCH v3 16/46] tests/tcg: move i386 specific tests into subdir 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" These only need to be built for i386 guests. This includes a stub tests/tcg/i386/Makfile.target which absorbs some of what was in tests/tcg/Makefile. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - move VPATH and TESTs setup into i386/Makefile.target - set CFLAGS+=-m32 for cross building --- tests/tcg/README | 39 ------------------------ tests/tcg/i386/Makefile.target | 30 ++++++++++++++++++ tests/tcg/i386/README | 38 +++++++++++++++++++++++ tests/tcg/{ => i386}/hello-i386.c | 0 tests/tcg/{ => i386}/pi_10.com | Bin tests/tcg/{ => i386}/runcom.c | 0 tests/tcg/{ => i386}/test-i386-code16.S | 0 tests/tcg/{ => i386}/test-i386-fprem.c | 0 tests/tcg/{ => i386}/test-i386-muldiv.h | 0 tests/tcg/{ => i386}/test-i386-shift.h | 0 tests/tcg/{ => i386}/test-i386-ssse3.c | 0 tests/tcg/{ => i386}/test-i386-vm86.S | 0 tests/tcg/{ => i386}/test-i386.c | 0 tests/tcg/{ => i386}/test-i386.h | 0 14 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 tests/tcg/i386/Makefile.target create mode 100644 tests/tcg/i386/README rename tests/tcg/{ => i386}/hello-i386.c (100%) rename tests/tcg/{ => i386}/pi_10.com (100%) rename tests/tcg/{ => i386}/runcom.c (100%) rename tests/tcg/{ => i386}/test-i386-code16.S (100%) rename tests/tcg/{ => i386}/test-i386-fprem.c (100%) rename tests/tcg/{ => i386}/test-i386-muldiv.h (100%) rename tests/tcg/{ => i386}/test-i386-shift.h (100%) rename tests/tcg/{ => i386}/test-i386-ssse3.c (100%) rename tests/tcg/{ => i386}/test-i386-vm86.S (100%) rename tests/tcg/{ => i386}/test-i386.c (100%) rename tests/tcg/{ => i386}/test-i386.h (100%) -- 2.17.0 Reviewed-by: Richard Henderson diff --git a/tests/tcg/README b/tests/tcg/README index 0890044cf0..469504c4cb 100644 --- a/tests/tcg/README +++ b/tests/tcg/README @@ -3,45 +3,6 @@ regression testing. Tests are either multi-arch, meaning they can be built for all guest architectures that support linux-user executable, or they are architecture specific. -i386 -==== - -test-i386 ---------- - -This program executes most of the 16 bit and 32 bit x86 instructions and -generates a text output, for comparison with the output obtained with -a real CPU or another emulator. - -The Linux system call modify_ldt() is used to create x86 selectors -to test some 16 bit addressing and 32 bit with segmentation cases. - -The Linux system call vm86() is used to test vm86 emulation. - -Various exceptions are raised to test most of the x86 user space -exception reporting. - -linux-test ----------- - -This program tests various Linux system calls. It is used to verify -that the system call parameters are correctly converted between target -and host CPUs. - -test-i386-fprem ---------------- - -runcom ------- - -test-mmap ---------- - -sha1 ----- - -hello-i386 ----------- ARM diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target new file mode 100644 index 0000000000..2f27b65e2d --- /dev/null +++ b/tests/tcg/i386/Makefile.target @@ -0,0 +1,30 @@ +# i386 cross compile notes + +I386_SRC=$(SRC_PATH)/tests/tcg/i386 + +# Set search path for all sources +VPATH += $(I386_SRC) + +I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c)) +I386_TESTS=$(I386_SRCS:.c=) + +# Update TESTS +TESTS+=$(I386_TESTS) + +ifneq ($(TARGET_NAME),x86_64) +CFLAGS+=-m32 +endif + +# +# hello-i386 is a barebones app +# +hello-i386: CFLAGS+=-ffreestanding +hello-i386: LDFLAGS+=-nostdlib + +# +# test-386 includes a couple of additional objects that need to be linked together +# + +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) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(