From patchwork Thu Apr 19 13:58:33 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: 133788 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp695940ljf; Thu, 19 Apr 2018 07:21:13 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpQvsrJCuIak0O1/Olg+jNft5uUFWMGuieAAGpwC6Snm5aTR0WzoKSwG7NhsLCSf6yhQqma X-Received: by 2002:aed:2a31:: with SMTP id c46-v6mr6238240qtd.238.1524147673648; Thu, 19 Apr 2018 07:21:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524147673; cv=none; d=google.com; s=arc-20160816; b=A1ejq4yc56j1Es0l/LSbJeoQDgUYGjiRX3OCzZX6/GNH8YBtaSd1S6JZd7+ZG29njZ IlF7t3ApVxEYjkHV/RJlfS8GEU/d+4vyIUnx9wpH0K/IL5LM9vejUz6HOzP7LNavxC0F rdY4sVgU76d9pDLktVEMEaHXUEEKyLv0CyJlt0M8IPjSRCmOMBhw4+z59YhJ24x+yYMi i6cJKwcFO6/fUKNTpiOLFDLDLGnmYjVwWaI+0AmotK5G/SInb29pZ4x5ecigrCD7mNVv IEOxOvEOmOh+D0m1tI8dPR84piGdwnpL7d5ybx0SfKI96TN+YUlT/n5TOckSnpxxvoFR Yf9A== 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=ZzZ1wWIfLSs5EngPAIdKm9zGtQ4oFInN7pGmkvmq2PfEWYP2UpWVHRB7iD+zH4MRS7 1Nc/x6QFpu8MVAy8z9cDCn3HMsKU2n7irA4Bm5dySOadwvDEWhV9c5lG2QOVWCON73Sf qCYmObFDlCRj5bceX4b0u9zorhA4KQD2y3DHVn3wUN+RuAT3Bo9ZV1HUoH9PHMgyNKEI +eKUNh4m8mPgyizqIqUF9e8qatKWG48gZG8c3McapBE3Em9UhJEhmNh72IpXbol+DsLg LvVoos9mQ+Jsa4qTp22FkpeFk2eOBUVpQpOJin6KGAGLKDSDTUJhaEFPyaph7eq9LXFW kLLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dfjILpeg; 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 d19si4758223qkg.69.2018.04.19.07.21.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Apr 2018 07:21:13 -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=dfjILpeg; 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]:50367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9AQz-0002OX-2o for patch@linaro.org; Thu, 19 Apr 2018 10:21:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9ADs-0004W7-Mo for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9ADi-0004lA-Ex for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:40 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9ADi-0004jC-6M for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:30 -0400 Received: by mail-wr0-x243.google.com with SMTP id q13-v6so14449180wre.3 for ; Thu, 19 Apr 2018 07:07:30 -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=dfjILpegRqqMG6c7PIHMxXTKgZ8Kj3vS7QFqS5jEuGCxq/iIYRrhezHx0j7vy5WYKp iLhxzqzvBpmJhdjP4IetkZPV9O2pCiPiwiXWHqkOAB7sJJmBCyTuO6T7g6DtGP0iNINo 0Cbpdg3l0cx1YtPWBycpgHnhG4/sc6aYQ4yUM= 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=cuul4x9xX0p0NsKL/Up8EQk+gCU95uxUbb/x9KCGPVJsgGd4E1UxvX60jNvHkm1H7g chbkIkkGvN83iAdXxc0oOG/i/JmDRAwN+72Uy/v68nCQI6udr616KkFYvVHHiiOSabxn UXw5p6vvTHjWQ45LTVHxBnU6lx2dMkqaP4hXQROixw06sxQwuUnUfozxdFQZtev59HQ/ FTTppeJN/KTLo1AL74Qumza50078PHDMGjmTmGjURbM4QAiOwHOG+PPnWSBUY2WlqYRO hY8sUcGzNbsYMVRMte4BgFyla1BHUolA0pwo5klsVfGksVkIJ906J8CfpVigHcwu2/2n nvUw== X-Gm-Message-State: ALQs6tCVelNNslMKLulPtp1ndrsWCUihW9uNY+qdn721QoQpFv8hmyGs 4BtZx8PfqgbJEnMoCFzllJkI/g== X-Received: by 2002:adf:c105:: with SMTP id r5-v6mr4697994wre.274.1524146849122; Thu, 19 Apr 2018 07:07:29 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n23-v6sm290948wra.39.2018.04.19.07.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 07:07:26 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A7DBD3E0486; Thu, 19 Apr 2018 14:59:02 +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: Thu, 19 Apr 2018 14:58:33 +0100 Message-Id: <20180419135901.30035-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419135901.30035-1-alex.bennee@linaro.org> References: <20180419135901.30035-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:c0c::243 Subject: [Qemu-devel] [PATCH v2 15/43] 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 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 $@ \ + $(