From patchwork Thu May 17 17:46:45 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: 136184 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp253159lji; Thu, 17 May 2018 11:03:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoWt+gve2tWJVH/QpitUuVj/c4PJu9Oeev+pfXG+3w1k70zYwoCkHlthZr4XrppjVnvZn/7 X-Received: by 2002:a37:b6c6:: with SMTP id g189-v6mr6202267qkf.334.1526580171321; Thu, 17 May 2018 11:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526580168; cv=none; d=google.com; s=arc-20160816; b=hRe8rQW3ZfUbxCZX6/blWOtoKVQ0H0W3y4Q+oFE4y7/sMIO6jL1WfgnFkuw22m2LwO rWR9OFaxsfJ0AQTI/WKps48lIkKXvtHOtLF5nuZ3+wVheRAxRZqCTTCusOO/NLHyo/sw AtWXT+1y8ZiYLta0MOoj1Bzug/PrgUMAhakKlYTGr2IhgrW8cbeY2ptUbmXLSkRPVAkc FBYpmFoFDm5DKNsLLSIps2kUAq1VmT9bg0IuWDvkeaZ+4/aPuINv3AVK06zYJCfAVnnk bRYK+aU//Mb2A0j26Y9SEmcoCeRQB7jiE576sB3lB/Z++lkO1zNfOJLJ/YG/4lI2udR6 slRQ== 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=8aeq+Jz2SXz0QAX+wC9MSE0CC4HXmXaMR4HzakbQtGc=; b=qD3/F98HrGSwBw9YwGok8CU2bJIBmefUIF32+UobFyrYHHXxie1tjABjHbha4In5js gypERQ8SLGIS0solLqPLfXtGfoeg7p2CPu71wL0bvaDIueF9lrr6kyAFN2BA08FSjaeF W/PlfHz0lw/ehiNHRBTgn1goFx3jslix/Dkzp4rM4cyb93a2/C3L5aYXA3mQ6Kwa3Qb9 GLsgHqI3JdM1mlgAtEIW2Bjl1sexRd4aee9b2uHXHGhRWrbjGCmhxAraMRQjuS2sg52m TT68+g9jb4Jc5v5P2Hcg1zDhfgOJV7QhEhRKmHVbF131b1rNONvs2dSTdnA0+XgqIs69 KDCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VyvXR53G; 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 u18-v6si5548091qkk.256.2018.05.17.11.02.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 11:02:48 -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=VyvXR53G; 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]:38501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNEl-0001QM-O4 for patch@linaro.org; Thu, 17 May 2018 14:02:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN09-0006N5-0d for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN07-0003b7-Bg for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:41 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:43135) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN07-0003ah-1l for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:39 -0400 Received: by mail-wr0-x22a.google.com with SMTP id v15-v6so6531627wrm.10 for ; Thu, 17 May 2018 10:47:38 -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=8aeq+Jz2SXz0QAX+wC9MSE0CC4HXmXaMR4HzakbQtGc=; b=VyvXR53GQXNhyr8y2WiKfAxkvyzKqm2zNqrtv4gOQCE4wGiDXw8teWZMer2OaM9pm9 Z5hgGmjI68Sc7qsDhi0qRVypVzWB8meVen98pR8ozRuoSD4CjdrV3ZUX2gvkl9g+CSlQ RtSvHrOoM4VYNKtouBlwBD24IhkT3Ca2z2yjk= 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=8aeq+Jz2SXz0QAX+wC9MSE0CC4HXmXaMR4HzakbQtGc=; b=nyhicjJpqZvIB95ZtjdsDonvJ/QjcV6OUY/VHgr6qyIBacseBNDixwUYNOyvGzKor2 73TJxEoBdlhiPKypFIOsDkKPUUVfte6namjDhx/tJBRSTqWQhXxRjUTwSdmAjBbWJ01R Ey+GG7Ld6Cu3B8iekVjj9wmJLMEYPs3IRNqyWRrvswfkkG13fRL4neGUtGePPOmfOc1m X0OryJujyxH7Cc9C+aGpKdxt4/sxCAj1PdTJkmAcV/waE+DPsjYyMv9EMxxm3gxaUkTN NgcpdPh+FC6O0S77OQhzOqJIaz01hJzhYopl8r0oZkNeUH2R8boEPQv83usBG8L8Wpo7 JUvA== X-Gm-Message-State: ALKqPwc5yJeIzUkoertHqD6y6JUF+20VhTdoAJepTD85dQgqlAz5W45S z2Id2bUu8BP8/X/w4ScMOMvpez4S+NI= X-Received: by 2002:adf:be83:: with SMTP id i3-v6mr4962500wrh.166.1526579257867; Thu, 17 May 2018 10:47:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 33-v6sm6760206wrs.5.2018.05.17.10.47.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:47:30 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 156EB3E0CE5; Thu, 17 May 2018 18:47:20 +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:46:45 +0100 Message-Id: <20180517174718.10107-17-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:c0c::22a Subject: [Qemu-devel] [PATCH v4 16/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: Paolo Bonzini , =?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.0 diff --git a/MAINTAINERS b/MAINTAINERS index ebc7117993..688f166d39 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 $@ \ + $(