From patchwork Thu Jun 21 06:25:23 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: 139470 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1685811lji; Wed, 20 Jun 2018 23:45:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKUT3jQjipmV6MhxHCLXsMFs7i95x/+9oLw2RhHnEkGDG1b7uQyGupq8/mCKLDujyaG+NaD X-Received: by 2002:ac8:18d7:: with SMTP id o23-v6mr22438204qtk.28.1529563513701; Wed, 20 Jun 2018 23:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529563513; cv=none; d=google.com; s=arc-20160816; b=Z0H+9ZvC3aLU5OlKstLZBNC2lTWsDLlBTCn4m1FUskfq6E4rfGbtJ0cKPXfuYDK1u3 9KtvXgkVcWIYQoGRMJzYwO4hkb6BMwOclXv5X511QANkqCVLc/yqXfOvviyYybiMTQJD dnLdT1g78XGNZfYmdUGnTMOSc22J2B2qnXK3t/Xmc4FjcmySppPQ5IQnjNJJ+OJ/dWO3 xc5JGBLvba+OGbDda+ivH+9RuzferVkOFPmDJIzySAmzlsI6qiIIE/BOz/5vQLrTKEx3 +R7bzMLOJ/UMH6htF5GjNxVHZuZzt9aNfSHiHg4YbtwiaupczF32c+1KfaGTkkzOQB7d 4kzQ== 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=yZBUXrP5+HGxi3XHSswQTTy6O35Zgd5tnvs2dStX3l8=; b=WuznENdBy/sE8UWH3rFEgaHcIepVvRnfNrZ6hxOodZZAdRbrA1o6/aG/BPmAUkkiQl zY5ZS3Aw3l4db7vln//j4gN63t5vT/b0f/X4R0ZXzWek3LjxsLPmSTFFaxDmfJ9u7tQ8 TYWWuQdzlWWZwhff1oMdnFqgMoj1DUSekDBwgATTJrDyhWBU+ZgNzLnyiH/JuNRuVNI5 y9a/Q98wVasLIjaMZJHhiVaod0r/EUi4CC1LZjw9C6vlJfKXpVN+cUbyaF3radCXjTqy i+TAxYsp0YXaUZlikxEVfcDVX/zs8iE9NMsZHWG34rw55Jy9VSxOFh4U3ZErf4CteOaw JoFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kzwcQSCn; 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 z202-v6si3757720qka.185.2018.06.20.23.45.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:45: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=kzwcQSCn; 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]:53329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtLF-0006PH-5J for patch@linaro.org; Thu, 21 Jun 2018 02:45:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt8V-0005jY-CF for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt8S-0003ok-Tu for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:02 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:44628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt8S-0003mx-K4 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:00 -0400 Received: by mail-wr0-x22e.google.com with SMTP id p12-v6so212460wrn.11 for ; Wed, 20 Jun 2018 23:32:00 -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=yZBUXrP5+HGxi3XHSswQTTy6O35Zgd5tnvs2dStX3l8=; b=kzwcQSCnKJEfHSSbUiU5RDx0ISw3g3t82JV7CVP/avysqql9qtWsnk2gnpSrA26uIC q+Ovk/vGb4w5+VVQ/oXjU5Fuavwbw8SqiCiOq7rUTn8m+spWNICxt4PWIl36DifSLMwx UkJ/UjtQ3Lhdc+ZpZhj6Vcog1QR7eu0X8Ed3A= 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=yZBUXrP5+HGxi3XHSswQTTy6O35Zgd5tnvs2dStX3l8=; b=Inv/ZcTg4+dQQseFtsUJSGewRvga+GPbk5cenozsVJLalCP/QwqGepMZtYrgeDF+00 jWBEOKZ6y1lKtRYCQ17aIrwhbGJkjtcaBZLnm9u6cqoNYtdOW7RAKsqAbS7r7C99U9ej WH7UfRAOp3cusVttZCpo2Be38wvxGjeyKtvRXJmE+FzIQw1oJyTyvuLo7KY1SAlNSC+c Ni4Bm3GsSD7nA4cwrtYjNQku0kUEWmyHQhglKLydqpIBscWUILiOr9JmSAWlleqM9o5B b5sOfvDe9qQrU9vXCbyXqftSrm4ZaFsVmxDe/rqtjpxfGTH4toUfOPc1uKX/023NZrEX 3qEA== X-Gm-Message-State: APt69E3vVR5YK2/53fFhnfD3BaiKaZD0dqODXGSXltfOku/8g1ZnZpw8 SGkXjY5TFTvPJOZMji+dfSl6uQ== X-Received: by 2002:adf:84c2:: with SMTP id 60-v6mr21204762wrg.167.1529562719544; Wed, 20 Jun 2018 23:31:59 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c11-v6sm5676709wrm.65.2018.06.20.23.31.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:31:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 86A433E00E9; Thu, 21 Jun 2018 07:26:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:23 +0100 Message-Id: <20180621062605.941-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::22e Subject: [Qemu-devel] [PULL v2 15/57] 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 -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index 28dc787617..590c24377c 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 $@ \ + $(