From patchwork Tue Jun 19 15:43:53 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: 139189 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5391174lji; Tue, 19 Jun 2018 09:08:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKom4PWLp5NZwKUutFZ3HAzsZSzuXjptaOubCS+W0a9UEBn0kXL2YSjabua9w3j/XmWwRfW X-Received: by 2002:ac8:2351:: with SMTP id b17-v6mr15115508qtb.304.1529424482609; Tue, 19 Jun 2018 09:08:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529424482; cv=none; d=google.com; s=arc-20160816; b=SNn8WI67FPRt1iqQ7atxgXOKbJf6fNTkSZf3ezpe7otGlG5IVyyLqa29V4yeahiz2B j+hHJFEUC1duPZn7jST762wjzFPIgmBNmiPlCthAGlEnCsvngYI8YQpaRyEQY4gk3MsS jp6K4T1aYQPc3zqoBq0rsgO4+6o0Ocap7qZdsA+OUlQl+65G7IaRImhxTU61WMMzFpDT 4AXKJkeu7C1UDROrx23xIXGwzRghWhtyNKVSTj2xvPGmQfGMDsovVzJgw3mR/vojl6X0 mJmCBFndqHlRugggFyDpc8ms73vFUEo+AUziLyZnKOb7Uyy1sp9Bk+Y3IFSku3Z1C+i5 NOYA== 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=RhFPZ/u3O+Kw3+px62qvwZhN2hQPpKILbjRd8hXQLnM=; b=z2IDYAeuN1+AnpYM7iMHaNbdDiZwb1aphK/JrkLcrhUV3peEXAzvaE6r80ptfBMfFy avw6DI0zxmp+r6LDlepbHwxuuEp3SNjm0zDEf8tFR+Cb6VCAPQARDV20vHCm/k/i4Rv2 TGGMZOEXnrSbod+3xh1+vbjVpYn5xM7O3SvdwZUHzMweArG/QZE1N+Et73xgKA1tRcoH Au0Ej8PiXHq1LDHvLHQMXTVN421MeVMhh37OGX2UQiwTHi3e3k8gSZighJ003BX+4Adt PtR0pyH4hVLgqGqqP/NltvtYf/lHWAz+/tVilmthvu/y1sAO7aA/2RLzusJQ0JMpuz/R rbBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X8ezNiwk; 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 y50-v6si38534qth.396.2018.06.19.09.08.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:08:02 -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=X8ezNiwk; 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]:43474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJAo-0000Xn-1d for patch@linaro.org; Tue, 19 Jun 2018 12:08:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIoM-0006e0-J1 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIoK-0006Qr-5o for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:50 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:54901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIoJ-0006Pw-Rs for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:48 -0400 Received: by mail-wm0-x243.google.com with SMTP id o13-v6so1148029wmf.4 for ; Tue, 19 Jun 2018 08:44:47 -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=RhFPZ/u3O+Kw3+px62qvwZhN2hQPpKILbjRd8hXQLnM=; b=X8ezNiwkL1l27J/A0qzpvOxgcEQVzvI7l4QCgeZC9+SUc6G7S4HjWgacgPK52K+L4d jff7U7C4DTQ3Qgf6kdsUsADuRnLHFUvrXI5G1YojlYh9N86zftcBtbO7TDFy2lmu9lBo 957/YQ/ROrpADFb/mQkMoKTaNQIghRoHoIbU4= 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=RhFPZ/u3O+Kw3+px62qvwZhN2hQPpKILbjRd8hXQLnM=; b=Lq+gRiiO+/x5qfOGNvjjMa4jcgzhXUtkE+3wL/Dj8+v74rl21+lBl3y9foDjFJZyxI LrREuRmOU+q5eAmENVuNDrVxUyC+EzCZvZ3i9mWzWTW3kaU2lwexAynpz4Cd8pWTNaxp AsKx71wqCW3ngGiGmRyv/KaQR5JYUmVHWrWaAwkFnDbnuLWw9p+5TDTrd+LbVH6legna JJV5lbflKQq2j3M9pRMlw5rAvXS88yQe/5EDb4mn4MYAtLjw/dDJCjIcCvf0juFKVLnm XwBoTkHP4+v53I5IJXM9GBcr61X6off27NSrly86eMFR7noALgiYBFrmiuWnSIFX0ju+ nLkQ== X-Gm-Message-State: APt69E3+TLCUKtqCGZh8Ef+8E7rT5id8ZvQpMqa7OiJJl2J6GuJoLnbh xXVIvlA28CoSZenMdmVFMm4RdLtMNxw= X-Received: by 2002:a1c:a006:: with SMTP id j6-v6mr12876125wme.61.1529423086698; Tue, 19 Jun 2018 08:44:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t9-v6sm186360wmh.41.2018.06.19.08.44.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:44:44 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A36693E0B02; Tue, 19 Jun 2018 16:44:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:53 +0100 Message-Id: <20180619154435.18898-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::243 Subject: [Qemu-devel] [PULL 14/56] 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: agraf@suse.de, Eduardo Habkost , =?utf-8?q?Alex_B?= =?utf-8?b?ZW5uw6ll?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, Paolo Bonzini , famz@redhat.com, aurelien@aurel32.net, 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 -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index eccd81e8e7..ea298cc910 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 $@ \ + $(