From patchwork Fri Jun 8 12:32:31 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: 137992 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp854413lji; Fri, 8 Jun 2018 06:09:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJra2qUvIz2E0oQLkdIiXqBToAe9uioRNPbfy/JN5JrVliImHDJcqLYH6RN4+eM1A9f/0Ph X-Received: by 2002:aed:234a:: with SMTP id i10-v6mr5825206qtc.263.1528463357108; Fri, 08 Jun 2018 06:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528463357; cv=none; d=google.com; s=arc-20160816; b=uEPZINAL9WL53OnH94my1mhduaWWdhmvCFsud++mkpswruUpk5Mqs51ibfo/w6b64r bgPwxP+PnFWVdJfTmVwhcfTJc+rUnGibpkHl1filJ2rX42pGWtjqnr80jf4Z3oBqugdX mDtAN7xJTcUbVx4zlEpcl3uoKWx9uPsXofdoatYQ4SuxeFxGaRiBGScfzn6histowcXY M47wqvqUDjTDrcWVLnxRBQiLh6k1+UE8AcYyw3maO9B/bxPCtTedv7+AbIfyES3hErJs b1lbng4paq5NlvcacYJMgUtaOv7saRF7uXhJvjL+T7YXBK84b54wgFGCF1b9qg55y6y3 QDIA== 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=pZydL+9eLZ6QxK8pp0/CTXRm4ObWxplTzyQnRdp0Emw=; b=a5n4WhxLPdo4VYm/21QXvujiYxX8UDcDm5ubZBZKcpscrZ8ZIfM9Mk9TlUGDLyUAzN LScLW/KDpMyHyl944xCWyVO4Nt82mAXspepb18Sm17aqaTHOPmepVSVyRM+olSLfRHXO 4h5GFZ2xLPXxBEMn7M2Vo0iGER/S83oZWq8aeLrE0PecvZIbmB2Qej3OkLsgd4ucrAK6 pqOeVTn8bI1NaZhKDXcNuZL4QwJKlshVT3yG5Q/HwKFB0rasz7FJJe77V1MQIp58H/sL ZovM/Ck1g6x1c+NbO7cWABqkc38CUh56uuMwOvYpSZEy8cWn+LD7bDaeAWAZiHiNr+8o Hohg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CRlH+Cdh; 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 s184-v6si8727420qkb.247.2018.06.08.06.09.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 06:09:17 -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=CRlH+Cdh; 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]:35555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRH8m-0005Sg-GB for patch@linaro.org; Fri, 08 Jun 2018 09:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGfj-0005n6-SV for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGfi-0000vO-05 for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:15 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:39765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGfh-0000uu-MU for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:13 -0400 Received: by mail-wr0-x232.google.com with SMTP id w7-v6so13251449wrn.6 for ; Fri, 08 Jun 2018 05:39:13 -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=pZydL+9eLZ6QxK8pp0/CTXRm4ObWxplTzyQnRdp0Emw=; b=CRlH+CdhFOiw0XsT36/bG8/8z7pcCo0ObXkU72RwjHzr6/FUc76gVHKPjiBTrCM2b0 Mlz1/y3483Trqro2hrbzKL/Vnc9qRTC86JKbq63YdaPwGXa+G4MLNqE0nItSSb4MIqwU 1bmn7uQRjy+ldGQbE9RPNkVJWbPtdEJmhllig= 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=pZydL+9eLZ6QxK8pp0/CTXRm4ObWxplTzyQnRdp0Emw=; b=pFqSAmbUYZlgwgwmdDHE2TZoFBWN2WWs06FOUx2tiz5Qx/e9hLf8GrRsPU/CKheS+8 KQjiLGkaFQrOG0mGOqvvxlPBsn0DFSWp0iBfANzb0Sgnl8IczHWIZFSAJQrolQeMcMNi MCvI43Mnj6qwidEbmz296VY0/XCndhPG2lSsAiPU0r1mLY9qtF08HbJBysmSQZJR8R// Aj/yZrlE7nfxLOcXG3C7HYtTEU3Mco0nzmdbFu8rHDjEazUFdl3XdSPiAWaAgz18Kzb/ A4uzC0+r1ZKJRx2vWeNPmQLDSg/xAlZ2SodMQSBph9CNQoAZwkDEspy+18W+xTDYJByF Wruw== X-Gm-Message-State: APt69E3m9zMbV/gRBsi/wRduN9GJy10IgMnaimX954tgWqlfco2vuIhG t6Q7yrYbAGcRjNuWm3uxYDYrMA== X-Received: by 2002:adf:9724:: with SMTP id r33-v6mr5281566wrb.79.1528461552591; Fri, 08 Jun 2018 05:39:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g11-v6sm3341967wrr.46.2018.06.08.05.39.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:39:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2A6C83E05B1; Fri, 8 Jun 2018 13:33:08 +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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:31 +0100 Message-Id: <20180608123307.24773-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-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::232 Subject: [Qemu-devel] [PATCH v6 13/49] 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, Eduardo Habkost , Richard Henderson 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é Reviewed-by: Richard Henderson --- v2 - move VPATH and TESTs setup into i386/Makefile.target - set CFLAGS+=-m32 for cross building v4 - update MAINATINERS --- MAINTAINERS | 1 + 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 15 files changed, 69 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.1 diff --git a/MAINTAINERS b/MAINTAINERS index b8f6c90122..e795b8186e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -283,6 +283,7 @@ M: Richard Henderson M: Eduardo Habkost S: Maintained F: target/i386/ +F: tests/tcg/i386/ F: hw/i386/ F: disas/i386.c T: git git://github.com/ehabkost/qemu.git x86-next 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 $@ \ + $(