From patchwork Tue Mar 12 17:09:06 2019 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: 160155 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13373139jad; Tue, 12 Mar 2019 10:36:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyMf9b2hrTVuh8phQ45B0qBQoo7RpQgCrjePz5ONSw5JTR04p+uq2NvMejoHpDbhilflbPs X-Received: by 2002:a25:2f91:: with SMTP id v139mr32704896ybv.407.1552412168639; Tue, 12 Mar 2019 10:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412168; cv=none; d=google.com; s=arc-20160816; b=I+z2jx6Xq6cHI6uwqAv14NQ3ydlYw41vri5vE7aoEbVmWXMuNfGOeg2Yz+e6SqIctA ptEF0PC5pGB2sj6C19mjTg8U4uBMsPwoPuQSUGL7t2ydp+c08rXXRuQPxMLsJQatEF4a 5+8SJcI6R0kA2j/4Cz5UOFTehEfBVQAaYzbBdDFWhBMAaat8ljNcAt4AFmLS08mnfJ/Y HIdIIbSq3jHPQ/Swddr/dGQcveeUbavky9jtmwmmWFxb6vZ3wP+FMlB7HVY0cG4yu/UM a8gDS0zBwO8VNfAf9deHcpKn+G8T9OAIyul/v6RbeXmRCPw+3Fac+D4h2NWQORu0tpDe Duhw== 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; bh=yYj1zSHunI6Ey6J/8akSHt2CuxZjmQMNEqVgMa3Bu/U=; b=LL2QP3rsbGTFiSdbBKqg25EAnhZN27y7J8L3Ir0qQyZVm8dV6zQOZHM7K6lluFfaTK Kiykz4hHeC/FSk12SknlpYgy0q4gy1l8cuQOl2DHzSPsxtzwC+Q+kTQcwnL+Sn+NXcl2 fvvZYb+o0tcXlNtjiZ53PAnK+oluSUAooBSjPriA/hJUebcG6AWQ6gNcZbPNYv4/NAP4 8i0w+y2yYiK3Y3leFHKe70j5wptM7f+gPKgo36iW3mUhfICdf0Y9fV4WK/XS977iyfuH viCjYH2JP0tanaiS4I8Dx3OCsGVCqbqvhfVhRlhIWofyNnVK64kYEGpSwLCwaxRHOKkG Aihg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vgLfLD6k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id n10si5036658ybp.335.2019.03.12.10.36.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:36:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vgLfLD6k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lJw-00050w-4H for patch@linaro.org; Tue, 12 Mar 2019 13:36:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2y-0005Wi-GW for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuF-0006uF-OM for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:37 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuF-0006ss-FU for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id x10so3427260wmg.2 for ; Tue, 12 Mar 2019 10:09:35 -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=yYj1zSHunI6Ey6J/8akSHt2CuxZjmQMNEqVgMa3Bu/U=; b=vgLfLD6k2T/x9Y5z5q03Tfn3mD67KjfqGnIK9l35kU5fsnAZl1jyH6nJweXOEx/XIZ 0e/I2nzjI9+5IFAlHJuAAik+scQeqjLSzT5E8tBbH/rgLqlB12t8J8DIXR79jX6ySKdU 2IrpSTRw4K+ylaqgSGsl7EwZvEiJQw2NSpXAxz+lzAfxKKHhitYoh0dhiL8A+ySMPhWO ciVHAK41JryFN8T58Jqdl03aPxZWEYE48TMgVc4wJjRvCF3wTylITOnvrQMcH+AvPNmz DgSD4xe+/Mr1zVymdP7cDzOSv5yXbdy6JKBucvYV83pNdsUWm3MfuzlMzV8rzByfOJkd SLzw== 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=yYj1zSHunI6Ey6J/8akSHt2CuxZjmQMNEqVgMa3Bu/U=; b=tUDqywBf6e97o5OalnMQtd9wphkSxZUNbbpo/PEXTCswq74EZRzpo1VqUCGgWReRTu fRulNV7c/4AO0TUtwIvd/kQjyD6WpM5G8OKw+rsgJ97H3Iw7nr5GhCUz+IGvJT6OXuNa VslL5jR4S8599pTjyEZgTzl2irxL/edZPIrZD5l/bc10v1jsnapuJ3ytglj70e87V2da aHw32JSnjADw/2l+VPhIS+v4QChhgXLGyse/WCL/NcDgG1MEgHRD3HryX4/K/zd6/efL Cxg6atjTdCeuFbLI8Kp73+QvtCjX3Los4cbcTHH6ExNvpnWKUR71QuYaetR5ivIQN99V b6ew== X-Gm-Message-State: APjAAAWpCtMCFIRUx16PYWgY5zQ5mwftBvybQcNg6bveQYF94F7pISEV 0SsI4usiTTO9nJHyYYL0MlAJJw== X-Received: by 2002:a05:600c:2144:: with SMTP id v4mr3122925wml.4.1552410574002; Tue, 12 Mar 2019 10:09:34 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i13sm18705874wrm.86.2019.03.12.10.09.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:32 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F1651FF8A; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:06 +0000 Message-Id: <20190312170931.25013-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::335 Subject: [Qemu-devel] [PULL 01/26] travis: Bump Xcode 10 image to 10.2 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?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Travis enforce the use of the git protocol v2 on their images, but the 'xcode10' image doesn't handle this correctly, resulting in the brew packages installation failing: $ git config protocol.version 2 $ rvm $brew_ruby do brew bundle --verbose --global /usr/local/bin/brew tap homebrew/bundle ==> Tapping homebrew/bundle Cloning into '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle'... fatal: unknown value for config 'protocol.version': 2 Error: Failure while executing; `git clone https://github.com/Homebrew/homebrew-bundle /usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle --depth=1` exited with 128. Error: Failure while executing; `/usr/local/bin/brew tap homebrew/bundle` exited with 1. The newer 'xcode10.2' beta [*] image doesn't have this limitation. This image comes with the following brew packages pre-installed, which extend the current code coverage: - libffi - libpng - libtasn1 - gnutls - jpeg - nettle [*] https://blog.travis-ci.com/2019-02-12-xcode-10-2-beta-2-is-now-available Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190220193541.24419-1-philmd@redhat.com> [AJB: re-enabled MacOS build first] Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index e942175dd3..ecaea97650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -185,6 +185,13 @@ matrix: compiler: clang + - env: + - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" + os: osx + osx_image: xcode10.2 + compiler: clang + + # Python builds - env: - CONFIG="--target-list=x86_64-softmmu" From patchwork Tue Mar 12 17:09:07 2019 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: 160163 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13387291jad; Tue, 12 Mar 2019 10:51:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxcUbb/vNXPoSX287vnFEGOvrib5ZBKGiKHZH9WfH97CAzBxwHuTzaArUHNCtLCB/iTeAKq X-Received: by 2002:a5b:7cf:: with SMTP id t15mr14899522ybq.143.1552413085347; Tue, 12 Mar 2019 10:51:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552413085; cv=none; d=google.com; s=arc-20160816; b=FpNqp5SmF176n5WrQUGux5bHS6vaqPOWUwgG9ySFQ0Z2kOrXXs+eE8uw65o/u6c1f5 IHrf9vZMwo4GM9maa1y9J0Zx64losmx6yglyMsS9Cf96J+kvo7YGJEyiqxalQG5cxtY+ bRg4hKnWNXz5nU432PEjSnOjHbc6aQ+9Gp99AxbPcLZgif1xLJb0EYrzQAVbuLSdo/qq AfNw+tVcd0J7nBgEr/0ZHtdUPScJdADaeX8i8uugSjAXf8nHgRfWF789BnmiPLY5tTqW NC3FdKjjeaQUT9+oGxJTgHy7sEd5aRoTJJV6zZOnwjtvtBjJ/w2CcKu/5pLH9H68KQPT 5xsg== 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; bh=+DfyJvPZ+P/Bv7svUqK9PmRBEz/b8LS8Tg+3jdsTEH8=; b=tpjItGr0lrlm/pbKP56Pj7DDjPjYVBw+tbQVSd95E95X437JEGSDNbvk9a0OXx4FvV iLkhUQbeFfAK/MulnVYVY5W1fx66IhipvQujqtQY9sGwwey7gLY7BBN7UQ/O6RAA0SvX YNMIiPFqRlk6JGdXYr0ErF8LtS03UtZs9w9hvsETRjPrHR1Ado+O1gMhsnxDXXCRqmjR dLLZ306AIpL5Wu0A+KQiscw8ghwhG0BlmqKgc3Ty+AMeXcmrgHjfnP/4d1wt3luuh97Z yLkB4uHYpUhy8e6DRciIM94D28KpzWPCK4DOAPFYQsh4s18CVvVDF58v21L3sdEzRaq9 29NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CWJ8glCj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id z128si6248308ywd.210.2019.03.12.10.51.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:51:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CWJ8glCj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lYi-0008Og-RB for patch@linaro.org; Tue, 12 Mar 2019 13:51:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2y-0005SB-Op for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuF-0006tv-Gn for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:36 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuE-0006s3-Kq for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:35 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f65so3507858wma.2 for ; Tue, 12 Mar 2019 10:09:34 -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=+DfyJvPZ+P/Bv7svUqK9PmRBEz/b8LS8Tg+3jdsTEH8=; b=CWJ8glCjBE5/T4eizgytizpVDLTbtaGnqv41ISI6XBU2L72a+L4Wt3GIP4xxk1Lass bxwHBMMIFuOzr6/RGrWqT9QEkwyYh/0JrUQB4+icyCXMVYmfFH+g1yMSPNcJnesFIE5y /QlBLEYrjiR3WDB1i4aM4JV2LCOm4FXJ+3pJtEjGU90GMZMSadeJZB5leaDvorxAabbK 2ov/w2mdp+W2nCQAV6OnU0PKLbtpGbWhZCLCMrXU1mUE/t/wemz0/OI6xNGriaCOfHwA 6Vlu+aI9hIuxkRjyrd6bjSv+azClHSLwk1xwaIqFAQ7rq1GPORjHhWa3igM8X/P53UrJ RHLg== 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=+DfyJvPZ+P/Bv7svUqK9PmRBEz/b8LS8Tg+3jdsTEH8=; b=HlJZDe0JcPiapErTNEdv8jilU+6ujBi65vrcImxzGcBtPBaDgcbGTWsvqgBo4G4U4Y GumtF+gyezFyRvjAnXVIICODTljm0pCmjX9FNTAw1JKcLtSzwPM7XWrTKcYlivYe+gy0 J7Qy/wjSjTAU7BgvcBaujAQyqaCPdcBzcs776JHNXy8mmJfEAtEHRoR/WiqNEvC4YXBV 5hNEkf7devqhypni4meQoLWRijE75Q1Pinp5StN7pbjJZcn8Z1GS0ja8VnwR6ZuV9+Gr gZzhQcGU1okLspi7lzqU3PxSpm0VF8dJkbCOT6UzN7zgnZe8vDHARb76ll9w0mBosBcz nStg== X-Gm-Message-State: APjAAAU2NutbMZxXRVLt3LHqQPHAW4UN3yJqWLDZbOQIegmT90ke5xFX TR6sTvQWX33zSpLXixVxuT26AQ== X-Received: by 2002:a1c:7519:: with SMTP id o25mr3116973wmc.24.1552410573240; Tue, 12 Mar 2019 10:09:33 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f196sm6310301wme.36.2019.03.12.10.09.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:32 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B3081FF8C; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:07 +0000 Message-Id: <20190312170931.25013-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 02/26] .travis.yml: combine docs and tools build with out-of-tree 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" We will be moving all builds out of tree eventually but for now we need to for building the docs as sphinx requires an out-of-tree build. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index ecaea97650..c46b0c28df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,8 +114,9 @@ matrix: - TEST_CMD="make check-unit -j3 V=1" - # Check we can build docs and tools + # Check we can build docs and tools (out of tree) - env: + - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." - BASE_CONFIG="--enable-tools --enable-docs" - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" addons: @@ -125,11 +126,6 @@ matrix: - texinfo - perl - # Test out-of-tree builds - - env: - - CONFIG="--enable-debug --enable-debug-tcg" - - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." - # Test with Clang for compile portability (Travis uses clang-5.0) - env: From patchwork Tue Mar 12 17:09:08 2019 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: 160162 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13384185jad; Tue, 12 Mar 2019 10:48:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxSPRHG4GuZjXmS8a1FfU3GNHu6QTBN1F2+vPIk7rYkK1p/cB6dZ01Abd88qG/l1/u7OFw X-Received: by 2002:a81:7a50:: with SMTP id v77mr10656714ywc.483.1552412883842; Tue, 12 Mar 2019 10:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412883; cv=none; d=google.com; s=arc-20160816; b=LiTAf6u+R5yi+qK737EzZTapmilY6f30r3harctq3+RbkGJihh2Kc5Ls42ZtWx0g7V M4cSX1MGv9oQKWCJWpT4xWh5XpfO/HgWS/XUmQFsNkz5gOhmPsTnLZXgxqR/z8eW9eLZ y52LiywVOPJjtWymuq+osZNxwRCoOIcowiSTeFkn9I9l8zb5S+EkxwSJ42mBghASAo/+ wU8pAo72WEAzzLCjR+cXKLXOzhqlwAwqat8qSefZokA+JANZz8vrYuOWX1YJO8ETVmxu W8LQxkKfGK7ILR147/CVMpA+4Jcp+xAFD0EJLUuza9SOtmkSaqgaQQFFjbX5iwcwR4Su cxgQ== 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; bh=FnZGQAzQ3AcjvSX83TZjFwl8F6XYn28iVkA7cg2Ny6Q=; b=iYlbm0DCLNeoKs6Mb+LKKrx90BDtqcWPkPYk/qvDEcpN1fzi89FCQ2eQW5ANFdtjHt XhwkOIWAS1HDY/tI3A/1DAHUbM8m/m1g3yQ6iwISSti0b75AZAj2D+BWkzcmSYxUetmT Y+TlrRtYpPS2zbcZL8mYW3cTcCmkCqPP7t99DQh1DsclrbB0HWHZIpopf+UZm41hZQBb jlgbyS+vooGH0UHrKAhoNseqkXOzAWGJSZBrrsuEEMqkssvcnOmM8f2VGx+1Hy4qOKy4 8CNwtnhJtTtRhozDGCw6pCiNt5ZaH7Q5BPUNGReL/YwfWwTMylqhU31oWtMFME8KiJN3 fRJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zkd5CObJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id d141si5332687ybh.228.2019.03.12.10.48.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:48:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zkd5CObJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lVT-0005fO-AM for patch@linaro.org; Tue, 12 Mar 2019 13:48:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2y-0005kf-1F for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuH-0006wJ-SB for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:35933) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuH-0006uK-Jj for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:37 -0400 Received: by mail-wm1-x329.google.com with SMTP id e16so3353162wme.1 for ; Tue, 12 Mar 2019 10:09:36 -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=FnZGQAzQ3AcjvSX83TZjFwl8F6XYn28iVkA7cg2Ny6Q=; b=Zkd5CObJv2U4Z5kOD6w7OyJvxSFGspFMr4nnz+j6rX4TLiBxHOKVnxHahd1Ft3S69I MaZpYO8ro9epJkvYNggjIdt3XDVJANSqw/SZi9lBs1pjvXbiS6gmcQgncxeQ5YhApijN GA1iQoDHJmsnOCKqsuWEGU+UrDcrdNnbL3necBUWC/m8ARwcVpN/lQ0VIqHzA0scy6x4 RyJbN5WRzRBMvOALd+LQ3KMU3KlhGsLsnOZeYWQ4oM5Qbce3/T1XwuGTTvIeyjAD4kgl uSdICAA/vqYeabyAd/s2+PNYd66nwmDIh8nCRCi0v5/ZI88rNfmLTDMhGkUDlto+a58n UsBQ== 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=FnZGQAzQ3AcjvSX83TZjFwl8F6XYn28iVkA7cg2Ny6Q=; b=PEYoP9YpeJX3n0Ypx0VIc2g2QDddjyNqFgTrU3u7eUfXirLQvKzA2E8qUKzEuyJY0r DvCTRuDZBX8rSANcZSmxFqsKgbVMIrHxr6HI6+XlbTXfbBbruAy8BQNhKoC7O9tXX69s sD8hj3+0tVbyrYpq7V2khPzVlt9Gkzt30MElQJBwEuLoBK7PEqowFaunyhrTuvqS6UO5 BChGZ8YsmlOwt5XUYqJX2vAXLZHGsdvegykW1rqOZAsld729UBWAqTzTqxa9DjroPFgJ 8DW6IqTB3X7bYB5jb4QPsPyxtT3uRI75JzTmBxJNUAwufr4VW8yM4XtwyfPKXIB9QWSE BB2A== X-Gm-Message-State: APjAAAUW7FgAARr336VnCyMa7clzsfg+Ylr986EWdnYEj4+ZhSwsXwWB U4H0R8zcUexIiPM6OLbabZKBo7TxJMM= X-Received: by 2002:a7b:ce92:: with SMTP id q18mr2712028wmj.133.1552410575330; Tue, 12 Mar 2019 10:09:35 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a64sm2853561wma.11.2019.03.12.10.09.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:32 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 86A131FF8D; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:08 +0000 Message-Id: <20190312170931.25013-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::329 Subject: [Qemu-devel] [PULL 03/26] .travis.yml: reduce the module builds to major architectures 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" The --enable-modules build is consistently tripping the time limit so reduce our target list to the "major" architectures. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index c46b0c28df..d5c9bbf1b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,8 +98,9 @@ matrix: - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-user --disable-replication" + # Module builds are mostly of interest to major distros - env: - - CONFIG="--enable-modules --disable-linux-user" + - CONFIG="--enable-modules --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" # Alternate coroutines implementations are only really of interest to KVM users From patchwork Tue Mar 12 17:09:09 2019 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: 160158 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13378214jad; Tue, 12 Mar 2019 10:41:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXJQxAxQwn3pv5ik2ZCYSgD8cSnsbCMp+xjPZbTPfHsI1QlwiYx1tKIUXycfmDy91T85Q7 X-Received: by 2002:a81:8c9:: with SMTP id 192mr31602711ywi.288.1552412493892; Tue, 12 Mar 2019 10:41:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412493; cv=none; d=google.com; s=arc-20160816; b=gZHrYSmC1IYSQnWyzIp2+sNQ6deKrGsPEpeACgNtQKID7Cs3mqD4GlmnW9xoIS2zsv 9IHN10eoBvUOqxliwDjpD3C5E5kSoK2e/L8+Zs1xafVPFqS1m+a4t+FbsYufkmS+84dA l+NcytJ3k7QeY8fPCls+0py5lwbel/7JMYTYIh1jcTZLCDRUjVTOdQ76B01lON6NA1kA kFi/jxsO7Z+9v4l5vQWLgipHv0cZNvkywwQ/WlI81o3oOUo1clCMVrbpHZpDkm2C9pCR L9oVSH68cJdOKm6DUoWVXU4MLskfEbDndINJ8MfusP4ICnhEDJD7WWdIock6pbzguPbl Bo4A== 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; bh=5Gd9/iXg9hk9ssGDGdTaDkBX8XzGCu4oTd3LGSPg3Go=; b=nS02LqUEvVM45NolLAWRGI2XBAfJenVCz2IZjfrt5DEpgjf6U+9zA4UhgqjHbKtIx4 W+6rO+TIru9jLcl39V/fwy12pSrEuvWHbtUY89NX7groILuFVbxLL/nfbFd1WtMhP+xo Ps9EoSs9oZZOz4F9mPCSuhSqyRBK/1roIAmPgEUrqRtIMJtPlDBycVi3pqnhCaQ0TaSu Bm/SoRTeJwFo86mEv2c/m8AFg+vtwGTTRjNSUozXWE5kkn6Y812h1abXBIzikheuwUJm YsPAOI5KIa1wMo/UUNkwblGPqpRZvDXSe2nozhWlMWIGNYBRr2ynL15VuTgmtyVV0Yil ORYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WUoDWxr5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id 199si5377801ywe.127.2019.03.12.10.41.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:41:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WUoDWxr5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lPB-0008Px-CV for patch@linaro.org; Tue, 12 Mar 2019 13:41:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2x-0005SB-VF for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuH-0006wS-Uq for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:40221) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuH-0006v9-Lp for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:37 -0400 Received: by mail-wr1-x433.google.com with SMTP id t5so2380353wri.7 for ; Tue, 12 Mar 2019 10:09:37 -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=5Gd9/iXg9hk9ssGDGdTaDkBX8XzGCu4oTd3LGSPg3Go=; b=WUoDWxr5f1zyj6WnJ+jVaAu21MQrA/L2lnzV54fgkukMVb+pkFwf6omGgoYIyo122a FkyCWfLPGgN9zXNWXnZwi73lGZZd1gVcMyy4oCANvLeRYdTkspdWJqweRhDCnhinuAtQ vWMMq4Z7sg4U+KT6W17DKl3Z14dVgjtR2j1CVRTKBHxTe8XEhwTzQy3RzMqamFTughE2 ToKiHMTPL870nwQz/IC4ebLVIHaLrVNPChHQnMVvwdqrMAOVhvk+ML9KLmKGqPifaKg0 EEtndugfPv8fbcqzts9HaM4qI7rzUpPpFY4dpRU4j5kxJD7PG4Cn4yjOSpOfnBrUS2t1 EdkA== 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=5Gd9/iXg9hk9ssGDGdTaDkBX8XzGCu4oTd3LGSPg3Go=; b=quet2pglSX3URyG88exdX4whbriHAU57LkBR3pFCYKWa7JZxjivxEyTYTS5GtDC5sN X2PoH6faZ58SP3f4MFLqWll/q8Qep/lClfbqyg8c2SKo/AvHEEDc5mkDsUC//4jbwCNj 0YQM0jnY5f6c6BM87J3p8LviaikO0Fhr/5Q3FETkPVvYr7MMUn6agL0wowEuTlpSYDS3 sLMKRl83XGaLd/ziM8/uuKDF8T3y15WCiXpQPKeuFLsaXNxEbd8fngrvb80QuIhJeVy1 6yrz0hk4sDAd9V6vi+AYgkPz/j47YujlhbVFmmTx8W9CguXuQqdzmBAiTyjOUN5xvnA1 yYxQ== X-Gm-Message-State: APjAAAUTcSUGXHxBvy5OFTT9ShUTWViM8ITQwiIOpnUN54a9b1o3Ldlb zNarPgHqX9lei8+F9DoNzG/R4A== X-Received: by 2002:a5d:54c1:: with SMTP id x1mr6048725wrv.161.1552410576079; Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g2sm2092089wrh.7.2019.03.12.10.09.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:32 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 931A11FF8E; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:09 +0000 Message-Id: <20190312170931.25013-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::433 Subject: [Qemu-devel] [PULL 04/26] Makefile: explicitly pass $(SRC_PATH) to gcovr 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?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In an out-of-tree build gcovr can get quite confused about what is going on otherwise. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/Makefile b/Makefile index 6ccb8639b0..7202ac76dc 100644 --- a/Makefile +++ b/Makefile @@ -964,7 +964,7 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -p --html --html-details -o $@, \ + gcovr -r $(SRC_PATH) -p --html --html-details -o $@, \ "GEN", "coverage-report.html") .PHONY: coverage-report From patchwork Tue Mar 12 17:09:10 2019 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: 160160 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13379187jad; Tue, 12 Mar 2019 10:42:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCGVy/Bxx87LVP/5DccwJhSMDceS9+1TahVR8DwmHjCC/ZiVRghe/XhAUTt1AxeCAtlCHP X-Received: by 2002:a25:d38c:: with SMTP id e134mr30993178ybf.192.1552412556124; Tue, 12 Mar 2019 10:42:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412556; cv=none; d=google.com; s=arc-20160816; b=YsUAaqnMPWeXfolZqPmEdl0//X7HJ6TtvwIcRrrQzXeSasEvhVFVsdY0FK3Lzt4bvs bNsWbc8xRsKCiz6MSZcgSn0UODlmZDzfugT1kqBUzN40WkxzYzUFgGimh5EARavyH3lC EMMV51MCyj8AU7lY1bZv0VvG+aUQYirlviAi/JuT08zW9WsYKW/y2ZNSC5iJ9QB/PTUd aVcUN3apzhie/b/vf6LjrVRE7VA00QSjYHO1ldZ0bjBRjYo5g6sY4lWTXvinTYSjkVI8 7iPTjCv/VqZPmHH6g9fty4yDFoi1JM1IECsGK6T7Mp9lxrziPmGs8eGcVk6xZITMzxE9 J5Gw== 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; bh=1tffW0Iho7mQiNu7OBLIMO0McjqEbeViEfSBAuT3IGM=; b=uF+aKlQD7eTpbv5Do4PCmuYVUhKcE4RaoqErviX4k5WcgtfTOANc50qE+w1I4WITzn sfLnMbWCie+Bk0M5RHY4J0GKqRGOYbjbFWGaEzMwyWRhrTOX37Vlbw6x6Dixn0IOOZYY T12kHrz50p0ESZ1k1jkBcSxpKSI/OmbTm8ylglH9TDSGaqB2KqEQATBj8dalfLvSLoVJ jnw3Wvf/471McSb6ezqYWNwkOi60ZHrUrHJo4mtQ4040iwY53AQ8Wew9y0LOM4fzSsto 6ZBvgBBRHJRMyafjO/hG4h2vCzO2APWGbvAShuVxN/6BwqbYvpveBOx6WaIv1ctPydio 3Lqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KJBVE3IV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id i207si5088716ywa.448.2019.03.12.10.42.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:42:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KJBVE3IV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lQB-0001v2-Ip for patch@linaro.org; Tue, 12 Mar 2019 13:42:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2x-0005kf-5d for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuJ-0006ye-Pb for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:40 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:33727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuJ-0006xR-IF for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:39 -0400 Received: by mail-wm1-x32c.google.com with SMTP id c13so2612316wmb.0 for ; Tue, 12 Mar 2019 10:09:39 -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=1tffW0Iho7mQiNu7OBLIMO0McjqEbeViEfSBAuT3IGM=; b=KJBVE3IVFjpNYyYxWkeFzf+UYvU6US5m6TudQA1wwZBq34Rn4OrR3+FyugBTlqWzSs eBhQlZzvw1q7yJqHxWnUclC6Cmv0IZELVwZWGGFs4UhWz9zYyGDQKOG29Z3cNjC3htpC p6t/m+VT7FklWk/0+7MuvX8smV6qMqgxJ67936ToaXtUkDJ6yVUlNCHlqtaY7W4dQ3Vc tihzy9PJho4FfsQzrMQVfi86iHmFb4ss1/WaWcDwdhaJEcWsbfx/HKk/dWNBbAHS+LHP lq37crhtOmfWPBUWsxizjGaBhERh4UutchEEdT0exQXi8Kb82qobG26hBzHBfTaoQ+50 5Rhw== 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=1tffW0Iho7mQiNu7OBLIMO0McjqEbeViEfSBAuT3IGM=; b=D7CZ/1OSgxgrdNrA4SuyHNsvFZ/n+Y4ZjdrSFEPBhDmL9IZiYmW+7tWD9LE9IjL0qI NBNcieChOYrasdalBcbYDLuIJbBP8ItiNxRXzDhkwUQMC87gzZEkTyurttlL1dzqNyjM pwO+2TWEXm2Ha6fPvsAIwobmGwDYHTZRjiV/WFJQMOGy/TX73H6aRJD/u09Y3gs+SCth 7JhStBsCJk0d4aRdWCzeEAZR7eE3xTdIVBBgZwuarMmwiCErqzmEpdJ7PHuQPEsNi8mP 95DWfk8cDSJeCSa9V0ghxh+EgHPS6SfSalMo+V1Q6U3sX3zs8WcD7SbDMTOipI0zYXAW paXg== X-Gm-Message-State: APjAAAVA9K1mecqiMH67nMecS9JIOh7eHTQGKg39d0toKcfExI2UqCGM DOluu0TSvO+YcHUsnPoDqnlajNa6BPI= X-Received: by 2002:a1c:9dcc:: with SMTP id g195mr3317361wme.9.1552410578375; Tue, 12 Mar 2019 10:09:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i62sm1833141wmg.17.2019.03.12.10.09.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9FFE91FF8F; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:10 +0000 Message-Id: <20190312170931.25013-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32c Subject: [Qemu-devel] [PULL 05/26] Makefile: explicitly pass $(BUILD_DIR) to gcovr 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?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Best to be explicit about where to find things. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/Makefile b/Makefile index 7202ac76dc..248fe9db7b 100644 --- a/Makefile +++ b/Makefile @@ -964,7 +964,8 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -r $(SRC_PATH) -p --html --html-details -o $@, \ + gcovr -r $(SRC_PATH) --object-directory $(BUILD_PATH) \ + -p --html --html-details -o $@, \ "GEN", "coverage-report.html") .PHONY: coverage-report From patchwork Tue Mar 12 17:09:11 2019 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: 160149 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13365894jad; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2YAsCNrSa97/3I89endgdzSf7AcKABIHPAM9TxVyx8dT9NkVXzWERYK1wOWK+xzIad/nv X-Received: by 2002:a25:b28e:: with SMTP id k14mr15011888ybj.501.1552411754915; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411754; cv=none; d=google.com; s=arc-20160816; b=0GIvnDlDq+xRbBIgB2/IgN9y0EnbjueyHymRW6o+xclPoND4XMafmBHU6QF/jm5z8b v7bWdtVHdJ66lyaDEAPsaAI8tmdj6iGdN7zkfS74MevzlOJJ7Syf6apuuDrwwYLwDO3Z kCOMY1unjffMCVGb4pCYPD1JwikLU9Rdj54Jn/iehWEhMA5ViDBGLNPm/YwtqvuohtS2 wgKf0QZE2RujrL3oPuG0W/cJ5UhOb7ojbVPuhhrd3FJmMoEvmdRcPIHOJQI70xD4EbIV oojx4n02iLcYEtw3xmZ2H7988rOlHzseGbcw1RHBEOfwxFrrrDZtnPrHChXSX+NUkdWg 4tBQ== 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; bh=d+lgv+5F7e90K6HKwZlH61wW/Nn4npzeGtRg0TRnP6k=; b=twItjWWpvpND0cFBY+FqbCRbNJUMhdWMKW0B/Nueki9PfIW4J92qrpgnIJo/J5Fwlp WY48HNTHK89StRSJK0w5m/ZFNfk8ZXekm9SqlzfmQSizHyQqNFMbH20PoIeZ3j3IITg/ r7HdzHMhg2r21WRrCknhHFw9diUwtjN/VFqH4wn60+MDhMNc+grWE5flXxCjYTkcAKgy IPOBj+b2q0kkbnls5VUffm8jfkaiQJg3nGdCnabB/11VJ0JciYXiYmSe+fzlE39rWyGJ 99SSxGp98ZmyErECO/CMYoipq9ftcHOiWbVq5ysdMu7C/7QZjzOgppVNUmSNN4hXmfPF dcAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZOzR0CHZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id s10si5031150ybg.203.2019.03.12.10.29.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:29:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZOzR0CHZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lDG-0007SD-DM for patch@linaro.org; Tue, 12 Mar 2019 13:29:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2w-0005OA-9O for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuM-00071k-8b for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:43 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuM-00070r-0l for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:42 -0400 Received: by mail-wm1-x336.google.com with SMTP id x10so3427658wmg.2 for ; Tue, 12 Mar 2019 10:09:41 -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=d+lgv+5F7e90K6HKwZlH61wW/Nn4npzeGtRg0TRnP6k=; b=ZOzR0CHZSOQ3W5UARxIiN3KGcHUU0W3CzYj2lRzfPLQp/yNUUQfbGt/EvnWjbq/SF2 S4oOczbgLgrsIO7d/d9nSNNT3R7VK3jO3IaqpIjYM+DZy2rvQ3Bui5Mis8x9kIXxGwXF ZFAzUmjnXajSWGbpJO3Ps8LGpQtw/YAMGjR0xZ+Qz7hsPXZsVzSaTxjgGa66LXYkaidk Dr8E+XTDkrbkOYDPwZiey/Rfuou6ByZRIIVDp0yRHMe4Cv6y72Y/FtHaWN1j5KCL6LoV sRJsuTbsSN/oN9pmIKUYIV34U4qTi1xZ6UWrp3shIW2SKf7tHAdDMQsq/usArzibGQVv a82g== 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=d+lgv+5F7e90K6HKwZlH61wW/Nn4npzeGtRg0TRnP6k=; b=idOXWyBLS4MlbisWyas8eK0ZdCn3bPDrcF30Qelu0WSVBK8dQLiOgJp//27dv4+dEf MCdnKyWmZi6P2j8kLIZdu31RIOcgTfKKr/E/sTcmty65QCcACm4wqvgXdY8kRyv259lo F8scdJyAnaU79j/giPrWHyMSStJmXdJvr8/6NbU2dBaf2S1Kp6Flt0EDVG9Omww2XGEz UYpaHSbigvoSw+BrGK84YCSEmVPkBgFjXKSGFtJhYZzn3fHB2fB4c5FAko0gNok2xWsI 8JMKmUWvt8GPCx1nLUTAoekAkUM28TR6xKmP0UnyGRfnUfsoXMwSBtY+83SlJqH8pb6G dfbg== X-Gm-Message-State: APjAAAUynLdfeM8fAOhUKDJ9LV6miql5raNiz84GD4EzMD9rlHGk2czM /9DyU8KJrRihJ6ew06eWbcQhQb1jeCc= X-Received: by 2002:a1c:44d7:: with SMTP id r206mr3276942wma.40.1552410580776; Tue, 12 Mar 2019 10:09:40 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b17sm12096948wrt.39.2019.03.12.10.09.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC9E21FF90; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:11 +0000 Message-Id: <20190312170931.25013-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::336 Subject: [Qemu-devel] [PULL 06/26] tests/tcg: add softmmu awareness to Makefile 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index bf06415390..55feab0f67 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -26,7 +26,7 @@ # # We also accept SPEED=slow to enable slower running tests # -# We also expect to be in the tests build dir for the FOO-linux-user. +# We also expect to be in the tests build dir for the FOO-(linux-user|softmmu). # -include ../../config-host.mak @@ -52,7 +52,11 @@ QEMU_CFLAGS= LDFLAGS= # The QEMU for this TARGET +ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) +else +QEMU=../qemu-system-$(TARGET_NAME) +endif # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) @@ -61,6 +65,7 @@ else TIMEOUT=15 endif +ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch, base arch # and finally arch if it's not the same as base arch. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target @@ -77,6 +82,16 @@ endif %: %.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) +else +# For softmmu targets we include a different Makefile fragement as the +# build options for bare programs are usually pretty different. They +# are expected to provide their own build recipes. +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target +ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target +endif + +endif all: $(TESTS) diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index c581bd6ffc..73b5626fc5 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -67,7 +67,7 @@ endif ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) -run-guest-tests: guest-tests qemu-$(TARGET_NAME) +run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TARGET_NAME) $(call quiet-command, \ (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") From patchwork Tue Mar 12 17:09:12 2019 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: 160159 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13378711jad; Tue, 12 Mar 2019 10:42:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3aZYPCjLuIB+wNVZtRbw+jUuhQD+OHZJ0jKXIA4Y7vdCVPTogtxFutqv3fFlJ4maLlpxj X-Received: by 2002:a25:60c1:: with SMTP id u184mr32263969ybb.197.1552412525415; Tue, 12 Mar 2019 10:42:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412525; cv=none; d=google.com; s=arc-20160816; b=nMdckmIAtNaiEPln0S6UFiOyueP10/1TuaH3Oy4YgXgXISNc2cV1rnW3bhN/jFPczT 9F3N/zf+ZH8Bg7N0qBayDKX2eePoluBw3G0IXNd1pqCacY/452/bZ7yA0A2vjSXO7GKS c66+uXEAZCgb9e5UIx6Og0ziDCuc8hz9dSexWs3bWf49NDbfHdlRwgzXQoUFH7em7Zao nK/r39DrwwnYXJP9wqRQTateaQlzT3pINT9nsV4zK9LF3qfDvE7CcCMGUPT2hpGS9z+V DNQiwbEhPHjRfxPkyOFumgfNYeYsLXhCgIJls8HdZuQhSFsRovluImNWJSzi6eASunK6 kCIA== 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; bh=8DTLAEQlDnBQ/HVgKbJxaSqd0v0KkEOMITucoauMsiU=; b=qqaRUIYK+jBBmZ7C7UJy/O8G4kTx5qtyYXjGlIiw3xVTpefOaD5+/79Y0OExKCt/tG Wa2rE+iVD1Re//EdT6RDPccHlLGe5/hnMeLwssy9JB8G2KRdewC2AVkS1yycyg8Ph1Gk TfMHE/+kZQinzLXOlgEMbbSkL+3vxiHROYxfz7bU/EbaYmetBmlw4TDb7v5cXekh+D1F Uz0o4i9gMxZU0QNH9Wob/eG89utj9/81kS+wH34fDbvCXln+cHr3F9QtUFDJQXDkJ7zn WRc8yqHg7a39jWV8bui1sEu8aTFOqZSoYFcnLEUsbhqRcyXk69oMEwCUXTyfBsxV99Eq jU5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Tkso779X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id i14si5298794ybk.277.2019.03.12.10.42.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:42:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Tkso779X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lPh-0000To-0H for patch@linaro.org; Tue, 12 Mar 2019 13:42:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2w-0005kf-6u for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuN-00073o-Kf for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:44 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:54082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuN-00072o-CB for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id e74so3497451wmg.3 for ; Tue, 12 Mar 2019 10:09:43 -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=8DTLAEQlDnBQ/HVgKbJxaSqd0v0KkEOMITucoauMsiU=; b=Tkso779XepH8qDYXsR8y797tTNbpbJnoLjyMld0ODNOOD+LnMf9MaifzH9VCL24sUS 6xzCDdh0mYsvnZyi6I5kcp93pBJIy09VWme4USNiDPue5necA/mw96JQvRZx7YKH7irv pHKKeoL8NGPAnWJb6Jvhylroripo8P21I0/LO7+K+JQJfeZuowJsZW16vTL2CRM2qnoS KuZ4QbW/SLcy5K+HlOYkXve3QlisGBlWJLALOuxEr9OCPAOzWI2ul6usBFqzCvpSfiay 3v+A45i0t3jC8cijLnnhVEnfSaygBOmaFEW2ZTYoxonnBZgtJSn6dB7OTpw5NlURnwtK ifqw== 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=8DTLAEQlDnBQ/HVgKbJxaSqd0v0KkEOMITucoauMsiU=; b=W42BvjcVexTjwxrQbaS8Cce7Qoksjh7viQmPWjhf99dLOum8qJw0sgAV+R+H6jsVSO 37yzyhmBKYZHEpHRLnQd7lCxnySdlRtrVkxlCVB33q6BW6ozB3QU5vUo/1zLcJ0bxXp2 wB/Tb/tawg3sePelec6tTyrWQVmdm9O0q5uoMTHrTRwngWBDIncoBSkOwpBsG5oTj0c9 Lg3Yx5ipYtrdzwXPF3Kms8HFMH8FtVb8SutBLEW6k/5Rn4OoXTXFPNaXMWVh6SEXUqD9 VQPYwWjJjh3tr53e2xypz91aPJO3n7sCymWeoP5tO/xia/Ycfmt0duJOsi7U4Rl3SLoC oGsw== X-Gm-Message-State: APjAAAUQPbN3VvLZTi+cB5wlLWQid+5R3doVdeYWD4m0yFRFFy1zvE8T sgWIxZ1uxcjXlB1r5wBSSTJhuw== X-Received: by 2002:a7b:c056:: with SMTP id u22mr3052550wmc.5.1552410582305; Tue, 12 Mar 2019 10:09:42 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d1sm10300601wrs.13.2019.03.12.10.09.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B89251FF91; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:12 +0000 Message-Id: <20190312170931.25013-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 07/26] tests/tcg: enable tcg tests for softmmu 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson -- 2.20.1 diff --git a/Makefile.target b/Makefile.target index d8048aab8f..ae02495951 100644 --- a/Makefile.target +++ b/Makefile.target @@ -40,9 +40,7 @@ PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= # Makefile Tests -ifdef CONFIG_USER_ONLY include $(SRC_PATH)/tests/tcg/Makefile.include -endif config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index a5719551dd..75b682cbe8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1061,10 +1061,9 @@ endif # Per guest TCG tests -LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_DIRS)) -BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) -CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) -RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) +BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) +CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) +RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build From patchwork Tue Mar 12 17:09:13 2019 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: 160154 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13369739jad; Tue, 12 Mar 2019 10:32:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNrXuKp44aJwCbz3uVuMAHfPikHjiQf3YtiFxxsx0Xc3quTU5Ce77XQJ6Htxp0TaKMA/eb X-Received: by 2002:a81:6044:: with SMTP id u65mr30249908ywb.88.1552411965271; Tue, 12 Mar 2019 10:32:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411965; cv=none; d=google.com; s=arc-20160816; b=J9kOfPv6UVYoVMUzUFmjYZzqZfB5iU5ISBnCkgXF8bgp0xGdHAOVtM2DXv4JDz/wBp iJPRsaM6S9UTHASr8h3FYfsLjEO+CumVidj4ehWzFGpThXHP8JgkhwMTaq4jyGGGHFyC QJHl0ysl8Zl3JoKtMsS00MNc6FAIlanCHzAO2Q0T+wjTK7vcXWhB5gytWbbaQdd7vlzQ /CmwlmqANHuEEd81cG4IaDTQsQKvph+qivMOFhcjitDDOcC7yEcDO7jObV9DDsdq9DTt VdXUIjVKqWvt6vkLWV0GbVZo7peJEupBBaBBUCeoBSfniK5Zvejnvojpt979voopWeIi YjDQ== 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; bh=iY4X0hcZy/BESHseg6JtLwmrVhnJdkf64nJ8r6ZNMPE=; b=mlKwlCR1sDy4gYk4MXsLvbKdlJwZGrKTpuTGXyfLrF4KuUIiZabCeFiPJ7U6IVfQYp YO8tNOZ7RWNFdB0DvSdwkwd54Lcq+oN0n2Hyf8R0BYTGI9AtcK5NFeXdrXVIyXtK6XmE MaoQJtsBzf6KkTfaZp28/y/tYSrZW5TZA6Hfu71xf+2Z/p0zdH7HTnMMaaU2Cz2iDPDh taBMLBsrOiETcqTp0p7NMytwEvY2CbEok/Rxc8w+7oIxalYQWTRSbjQpcAXkiE4oOUig QXdexQm1gyWk0hSufaZ5NC3fRj2ZAwfuatQ6eOj3NQBccbPx2fv6/Bkc4RkqsxdYfcmB V/bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QlR8kODG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id 133si3811334ybu.129.2019.03.12.10.32.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:32:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QlR8kODG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lGe-0002Dn-PA for patch@linaro.org; Tue, 12 Mar 2019 13:32:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2x-0005SB-2F for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuK-0006zA-6v for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:40 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuJ-0006y3-Uy for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:40 -0400 Received: by mail-wm1-x32b.google.com with SMTP id g20so3399760wmh.5 for ; Tue, 12 Mar 2019 10:09:39 -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=iY4X0hcZy/BESHseg6JtLwmrVhnJdkf64nJ8r6ZNMPE=; b=QlR8kODGSx3HY7kWyrKysc9x0tG4Nkne8Ws/F/NdUPbxeersM5qKCCNBmdPzjI2y2c WBohD3OBB+lw4tB4ReW2eOe80YS4qe9+VJq4OQo8DbWXiiPcfl38EEjY/6Y42cKBZqPL XhShgf7f432yRaToC8zmrrQCFihSWL1DB2K87CNqumz0PWHwjXNQCI+KWZPVauFmHVes u1MlTjdRbldNKqhsn3/VylJVxpr23z1jd7AJu4BiYxh5YP1Lt+qoGPvSLqZdYL9l8cbC oo+0oISMOyC5s5Md4gX6qo45yMkIN7+D9JTLTGUfGeegc/9Ub+wixataNH857Fxf77v3 AJMg== 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=iY4X0hcZy/BESHseg6JtLwmrVhnJdkf64nJ8r6ZNMPE=; b=JDbD5Yw3CHkhMiRBqLMT27s1fmi+eCS4pYdmzINT5kGhXQDr55kwrSr/b9HX6iYe7m bnEsuAySg491C4jfkEyiYqfCmFKdeO3MA1Nv6ibhm+3z5Pbz4m6168ju9Yq9vYqREMC5 iLypz0L1k0Fj2erlTelq4FVl6pOGYrcbx0d8BygoUXQ7iQNA4J9hsw+GOvI5MFymoKxm 9mfbmXr9fQ7FPfbPAmQVBi/42iiTNPqOX+8C7+kilMWgEmoAzurGRhP1Z5sy+UY/yUH0 8u1G2yF5jtLlnaJrVah/WbRCqevQvrBtiN+RALce05pFyBq4ZiLine1Iv69MFUFNYbTa BLVw== X-Gm-Message-State: APjAAAXCD0cVmgIx7x3/u3F02evxJBn1XTImL+cI/5ifNPA6GD0UgSj/ fzuC/D43R1Yt/lIdxqUlWT5psA== X-Received: by 2002:a1c:f50d:: with SMTP id t13mr2886579wmh.81.1552410578899; Tue, 12 Mar 2019 10:09:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o5sm3182850wmh.12.2019.03.12.10.09.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C448D1FF92; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:13 +0000 Message-Id: <20190312170931.25013-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32b Subject: [Qemu-devel] [PULL 08/26] tests/tcg: add QEMU_OPT option for test runner 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will allow tests to modify the QEMU invocation with for example different -cpu stazas without having to define a whole new set of runner types. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 55feab0f67..454d0a4119 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -54,10 +54,13 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) +QEMU_OPTS= else QEMU=../qemu-system-$(TARGET_NAME) +QEMU_OPTS=-monitor none -display none endif + # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) TIMEOUT=45 @@ -108,7 +111,7 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS)) RUN_TESTS+=$(EXTRA_RUNS) run-%: % - $(call run-test, $<, $(QEMU) $<, "$< on $(TARGET_NAME)") + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 17:09:14 2019 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: 160156 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13375057jad; Tue, 12 Mar 2019 10:38:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyK06I22sphSbtDJ/sLDHDcCq1nVbUJa1azVzeCa3kx6G4mPfMweWNc0y0BXVwKcjyFJ9j7 X-Received: by 2002:a81:4cc1:: with SMTP id z184mr31741124ywa.142.1552412294379; Tue, 12 Mar 2019 10:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412294; cv=none; d=google.com; s=arc-20160816; b=NMYVy/Vz8/2jd93Gnp+1ymYsbOVH2aRP+ENds0IAOOItLmuFSOjNAIYbmznbL5ZJFx nvPX/5Q8G/ZNwOQO6eDCjx4gA1m5gN3CTKF/KmpHe+bpoWCh5NG/QmdXmpjLFlw1t2ND Ue08Ph/uRJ21fUcU1okRAzeeitdIHWpWW2K2lYAn4xE8kaNnsl41t4aj7Ujd84IoKsxQ ozCgO0flR0o/2QMRPscWYSAvO4eEc0M6btjqAFqq/MtVQzwO3rEQKzblJmSixHSkR0xI /XeEoUT8cY05ooUg2vNq9xxCpuO1vGt5Dz7Dah6f+dOSR3zDbqRnIrwAKs0gVXJVIy3H 4bfg== 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; bh=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=ek8ha+gCWNZRGAeoiDzbmKnT9bE5hoknFKHTu2hu7L5p1a1arbygDpCQD8T04aQq66 Dwb5O+SU4HUMB7lnnQ3jlJuwmaed2vYPxhkMdVM59bs+u+KkLObeRbLV/WSLGi44zBEz rAh0rJPVxhpoAvs/fnkUqCTkval4CQOIAEvlCvaYtaG5pGg3lxnZQjPagM0fqvQDFqpF UOg81E8hwcypkD0BfzZdDEruuNkZdnLUylCApxBkWLliHyk4J7dEosgJf739m+XoTDzq SBFMQ1gtCEbNhnBNsCNRpGhk95fqWhmgYn4jl/AwJA5u3j9SxclZWIzGY2hQ5xP1+gO+ R0vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q+TtWgz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id e133si5107407ybb.226.2019.03.12.10.38.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q+TtWgz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lLx-0005rb-QY for patch@linaro.org; Tue, 12 Mar 2019 13:38:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2x-0005Wi-Ic for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuI-0006wc-69 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuH-0006vN-Uc for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n19so3508894wmi.1 for ; Tue, 12 Mar 2019 10:09:37 -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=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=q+TtWgz5wnzistaZvU/KQZvdIrS7EGEE7zJcY2ZOc3JvBJFBKW0qBgngrIotQhOdxI Uh5p8zlCmTBKlBEMdWDWl7ebhve8JS146/6cdL7vpuCu8KTKVeERE7aR9niH+j9MS+s/ eJ7FXzZgM3oMX8895LPT8LRJRy7PpHpf+FsNsEX4AlZwPivF7Iy1wdnCb3aRXTWC+i3w aCc8oD8oBkJJFUZRCwWYbMUe6e+VeYS3Fn7JQGkVvk+4OHFdr9yvopxwzkrofJdiReOd hEcUbxQQB3S6w32wfqUMdV8km/UjGXhJd3fgQJx/ZI4+Uk1F70126z1sOTrb9DbhJ2+w JDXQ== 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=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=AYjyKYvx5u+tZs7HOydq8aFlbNGo48enMZ58dzryg9GLllGfbGdAnqhzV3n0JxcwJN 9hJAYK5zhaGTlHIAZyEawSYg02LwEf3Cn+9XA5DxLb6L7E1zNKfJNnWFQE64UDP9Mot1 KScpNJTIDg4HI+PJIWidbOQr8aiJIxqOvChG9fh9THuJIu8xhjxWk96InY1rbRev92zJ l10pOnNHLt8mKkUai2OLkyqaw5iEeyEGhEvhF7//LZAbVbeBRoLlIpTQF71LuXmZetg9 yaBXh1WZl4Q+ZAl/BrnUV1rrZAc2/YDiQToCcSNsFpYsYm1/APdEglwsx8vihdZmoFJB 3H/w== X-Gm-Message-State: APjAAAXUp/oTEoEXJbUzyYqwKjC+PvJn1P8MDUuC/cWowribP/0Bk7PG QkTZub4RERb4mK6ZqkZQi31lhg== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr2982721wmc.94.1552410576419; Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 132sm3796993wmd.30.2019.03.12.10.09.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFF561FF93; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:14 +0000 Message-Id: <20190312170931.25013-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 09/26] tests/tcg: split run-test into user and system variants 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" We can't rely on shell redirect magic to get things right so lets setup a common output chardev that is expecting to write to files. As we have split run-test up we might as well move the default monitor bits into the call. Finally a little make sophistry is required to correctly quote $(COMMA) and as we don't inherit common rules we have our own little copy here. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 454d0a4119..d26a36df61 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -32,10 +32,17 @@ -include ../../config-host.mak -include ../config-target.mak +# for including , in command strings +COMMA := , + quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) # $1 = test name, $2 = cmd, $3 = desc +ifdef CONFIG_USER_ONLY run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3) +else +run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3) +endif # $1 = test name, $2 = reference diff-out = $(call quiet-command, diff -u $1.out $2 | head -n 10,"DIFF","$1.out with $2") @@ -54,11 +61,10 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) -QEMU_OPTS= else QEMU=../qemu-system-$(TARGET_NAME) -QEMU_OPTS=-monitor none -display none endif +QEMU_OPTS= # If TCG debugging is enabled things are a lot slower @@ -110,8 +116,17 @@ all: $(TESTS) RUN_TESTS=$(patsubst %,run-%, $(TESTS)) RUN_TESTS+=$(EXTRA_RUNS) +ifdef CONFIG_USER_ONLY run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") +else +run-%: % + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ + $(QEMU_OPTS) $<, \ + "$< on $(TARGET_NAME)") +endif .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 17:09:15 2019 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: 160152 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13369093jad; Tue, 12 Mar 2019 10:32:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfelWhQs9RDAxhMTc21srUydAsPQi+Om+JXaxIprKNMIaBoFwNm+MmF7G2IANeyz2nAuaR X-Received: by 2002:a0d:dd4c:: with SMTP id g73mr11693281ywe.145.1552411930784; Tue, 12 Mar 2019 10:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411930; cv=none; d=google.com; s=arc-20160816; b=xLisVDWzqXJed72I7KvWb/vtUVYHyJZTW4G7JqmXdoYJZZ+uIOUysIN9JTwST0f3Re 2UHbzHj4J9OLwgVpvqPhOTgmUhJs74HZ92xyy0FDeKYTokty4j5za5HC+pYExI77th2n rNgMyWtrD+Q3UFeFxvVP7dRJdeU9PoaiDRw78ygubBxCa+/tkgf+bxgXR7lOZJrfCsIM zKzJ6LPrAGTmXAf4Xyn4KwbVVUdr7z57AWB5IlSXHuc/dO8cGU1RilxakQbbKrWhoPb+ im3aUnBWmt46qXiRftx1VHU+jGkbN2ZydmR8nH8HgVeGCOXEYPLhEHEpxd/GbIXkdbQV wvqQ== 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; bh=K6MaTZCdhDIYUvzHZkAhVdzvFNZYvQwy+ofqLf29UbU=; b=p6xy8bU9pwGYIO07JQZJfXu1n10xX2N6N77JKj3oz+N1t+oupGzx3hqN/JC96ovuQj xcOqw0io5px4e5B1p9MkxP62u+xtnczodIjc2IvhiC8gIjutDPwyXu3eNPZCJf3hlptj AHA52yz6vlyfuUdwqtbkrkcWPam/zKhmqjDqewQyVOraBDHwz8LF7hS//bTuZDH42whG rG2sKQU+IqX1DZ/seWTb0W+bGpXBF8R6L4Off2LoMR1LX0oT6khf+jnjUK37vBYzx41t 3mb1LxNOgocnds7YQyvBl+jXt0LLHai43lmfkuqWfbFIDJ5X3z9CAmw6xXYcbEKJ2aIV i5YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PQCOsoz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id t7si5442575ybo.143.2019.03.12.10.32.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:32:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PQCOsoz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lG6-0000em-8K for patch@linaro.org; Tue, 12 Mar 2019 13:32:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2w-0005UY-C9 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuL-00070g-5w for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:42 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33730) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuK-0006zL-Sf for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:41 -0400 Received: by mail-wm1-x32f.google.com with SMTP id c13so2612359wmb.0 for ; Tue, 12 Mar 2019 10:09:40 -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=K6MaTZCdhDIYUvzHZkAhVdzvFNZYvQwy+ofqLf29UbU=; b=PQCOsoz52oMZlNJuBTLacObkFQPR+1F4Wipvy832fyrDNEgfHjvsAJx8fgB77W/KJ7 7YYNKPHsX1uTSf2VK7IToHW+A0jIKgTaoACQGvDhY1SLikSUMBQ16PvwINFByXzciw1S Atl38Yb2TYfPPbWPBYgcWWkou89XVPDI0wKgiECpW8fVvntx6p9oRa9gwhISY2e7cm16 M9C6qmXEYIkfHui98KA5oPoY/Aye6IrkpR4JqbRkz4MikAIVrXspFmdsd698Sq0AGiAc brXxLl9YUURMCNyG2PednWhDdv7P6mG2iZpEFLeYdjY+AZgOLOAre9PSPAuT+eskP+8X H2sw== 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=K6MaTZCdhDIYUvzHZkAhVdzvFNZYvQwy+ofqLf29UbU=; b=ixfHbmVV43GiNTf7VyKX1zat4z0fBTHe9f4VcME/RZmQAM9qSfWvPR/bPau6k5EtRm K7ypuCOeGyMhYW8NtR51LNt6K3VbIam41vGBtBjFr28bOvkoDpH/C+Qng91j86YF5kPt 2l1CXdPJPdIdQfeywCDPn42Z/KS85wVRdQnFiBo9gao2pmDrisRJgoQZ9NgXO4NEre2C mQMFVZOmeEnh1+uzhM4mfpKYaiG50+swOHZIzSwDVib0zggRo+3cdIkenWzkbkoMesAZ kkqLMfM4fDfCe9u0zldU03NC2PELX3rcMVmJaEQUPoruHfWtcpah95vkb5eKj9XAUQvp IGxA== X-Gm-Message-State: APjAAAUj7UFHu+NvN6OsNOPSk5ZynqXq3kmIvVz5Qe4w3iVDeRs0vzRq Dav935/LRIPeSKWJ2L44IfmEUvXGFe0= X-Received: by 2002:a1c:20d3:: with SMTP id g202mr3301124wmg.74.1552410579832; Tue, 12 Mar 2019 10:09:39 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f7sm9441948wru.3.2019.03.12.10.09.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB9711FF96; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:15 +0000 Message-Id: <20190312170931.25013-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 10/26] tests/tcg: add gdb runner variant 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" With this you can launch a test in gdb with: cd $(BUILD)/tests make -f $(SRC)/tests/tcg/Makefile gdb-$(TEST_NAME) Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index d26a36df61..8dfd1a76b9 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -128,6 +128,9 @@ run-%: % "$< on $(TARGET_NAME)") endif +gdb-%: % + gdb --args $(QEMU) $(QEMU_OPTS) $< + .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 17:09:16 2019 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: 160151 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13366911jad; Tue, 12 Mar 2019 10:30:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyve3NzMBXLqGyljMoPROIh/95wMjLEHCzuDpSFTmxsDZ/OGtPT8KHqdDDw+U2sAPlU2XCX X-Received: by 2002:a25:ba8f:: with SMTP id s15mr10357732ybg.411.1552411813234; Tue, 12 Mar 2019 10:30:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411813; cv=none; d=google.com; s=arc-20160816; b=DFOjiFPu6gUFclvNFkJc4pfRtMiRxlerwfhQCg8iKkIqYISDUVOzzW2smW9AhRaryK bRygkTZhszqRFpfHwTco9qSjFomhOtdE4Fq409/5ujlDxc0jx5Dy0z8U3iBIuOD7bEQ0 jt4WACROFv2kQy46rtl1Vupb/8ktwuY17k7VCk86g5PWOZ/xhbd2RCetg4lVaYWI92Io LVeUyCpBN/ibC2srv+JKCD1qQh8EMQ+/EaC37LgswkF1CaZlsCOparJjcdbkGAAsRowL WPFR9yH4rf9L8iIByy5iInslvsXblC4MWgvo3Fwl6FbWIrfdT+qqWGsJihRedbJgjPnN pBxA== 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; bh=ZArt+ao71AF3UQ9a6LVsEdfkEb+blM5iefgcjXTlA74=; b=BrbHAYLGyy2TfMA1RjLjZZSKSkVtZ0bkz2bBs68hJLHum0PXVkNp5ic5WSX5WFwHsI EDhURARtP4lZhsDmUkxyXB505C/zQyrD9n1qJ+g2UULTu04LHbII83ixc+5/YkGDv7Ho 5/KmaY2klguKe+H9n6iBoN+bYLoSH9ikYw4kIXziYJZ505FsJrFGFWN/fufTwjCBDlY7 DGN5UrPy8B0XszCjkVh67FXwmYhDOqel6a7ot9b45t1QJtKH/16G6YVBFkvMn7TZHZcg b+xdkotUQ6j/bSfYHWvigs4KSmz+L7kVkpQ/By+I8BALVsngGEOTcSQjuvVttknuxXDN us8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gLlGruI4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id t6si1199807ywb.39.2019.03.12.10.30.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:30:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gLlGruI4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lEC-0007Uc-Jx for patch@linaro.org; Tue, 12 Mar 2019 13:30:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2v-0005OA-G2 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuO-00074j-LN for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:45 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37360) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuO-00073t-D8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:44 -0400 Received: by mail-wr1-x42a.google.com with SMTP id y15so3565637wro.4 for ; Tue, 12 Mar 2019 10:09:44 -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=ZArt+ao71AF3UQ9a6LVsEdfkEb+blM5iefgcjXTlA74=; b=gLlGruI4FBDFO9DaXzKbb/VarXl/OosUL8HU6MkjcGvUIrIX4qsJvYdGeq+02aYtOS FWWVXyIb+n1EbMniNJpVrKQXmNwn6NAoaIUotZWZilthKQD05fZX7ivSJJYTWuQytOgl 8OMKmDMPA0u3esXCqMkHIWM8EJ/CNXKlB0F5umeiqzzBvraNHDStuq+7kyli7E5D9Z44 UO7wJ8UpX0UHhUfKHZvqPgD3dsJ5xH3Wp45C86hmFOL3VOX7yVQmh/97oZqPrltJf2hS /kBIQ78+DlAMw/qIXV9yh66Rw098BmMbMo/zLdFhfdVeSfZpILYt1D2QbbeY/BZZ+gTX 9nQw== 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=ZArt+ao71AF3UQ9a6LVsEdfkEb+blM5iefgcjXTlA74=; b=AXCJ+7PPCLZxEaWR3wkGWYnioXEbZDTO44qOhr+zwylAxrohYbhTHmsHI1ALSTUYKl sEFA9BvGyIs+2LR1oL5X5NCf5fOGK8SIfYd7TSB+INKcnOfYzB/4920yT16rkzHvGBwI PiH9HW0mRi6wwpZLa9r3UGM9bS0d8IG1kvZ8iuuTyfLL+2M/5hEh6rZcO8Kr33FIXIzs eHtmmNAX256qtlD31PMnKtLzOH3N+4EmVFSdde/i83Y6/0BVYkfhi4Mre8Lx/1ivOenj Ujh9ByFPfeEP3KLnpPmXNalBqWQlnIdMSmIQoW/If97qMraktewYerPT2O+zlCqQMJtE ybaA== X-Gm-Message-State: APjAAAWhEOdYF5rEnoeFaHNWgtji+f9KiU6VcTle7RyRhVZFn4qUHVBs 6Gk3j97Pd9jvsJcbIaNLTuR2/w== X-Received: by 2002:adf:d84c:: with SMTP id k12mr16108555wrl.58.1552410583147; Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a82sm5042669wmf.11.2019.03.12.10.09.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E75041FF98; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:16 +0000 Message-Id: <20190312170931.25013-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::42a Subject: [Qemu-devel] [PULL 11/26] tests/tcg/mips: fix hello-mips compilation 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" The compilation flags for proper building are in the source tree. We also fix exit to 0 so the result is counted as a success. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target index 086625f533..1a994d5525 100644 --- a/tests/tcg/mips/Makefile.target +++ b/tests/tcg/mips/Makefile.target @@ -8,15 +8,12 @@ MIPS_SRC=$(SRC_PATH)/tests/tcg/mips # Set search path for all sources VPATH += $(MIPS_SRC) +# hello-mips is 32 bit only +ifeq ($(findstring 64,$(TARGET_NAME)),) MIPS_TESTS=hello-mips TESTS += $(MIPS_TESTS) -hello-mips: CFLAGS+=-ffreestanding +hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -mabi=32 hello-mips: LDFLAGS+=-nostdlib - -# For MIPS32 and 64 we have a bunch of extra tests in sub-directories -# however they are intended for system tests. - -run-hello-mips: hello-mips - $(call skip-test, $<, "BROKEN") +endif diff --git a/tests/tcg/mips/hello-mips.c b/tests/tcg/mips/hello-mips.c index c7052fdf2e..4e1cf501af 100644 --- a/tests/tcg/mips/hello-mips.c +++ b/tests/tcg/mips/hello-mips.c @@ -60,5 +60,5 @@ static inline int write(int fd, const char *buf, int len) void __start(void) { write (1, "Hello, World!\n", 14); - exit1 (42); + exit1(0); } From patchwork Tue Mar 12 17:09:17 2019 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: 160146 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13363318jad; Tue, 12 Mar 2019 10:26:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQlAJ4DFELLioCjnU/iipVVKDWo2JSCVS48Gw/I137Gh53FOhhNww2TD1bliUYxtHubZqp X-Received: by 2002:a25:6607:: with SMTP id a7mr4148686ybc.71.1552411592035; Tue, 12 Mar 2019 10:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411592; cv=none; d=google.com; s=arc-20160816; b=jPghB219aKoMSACxDclYXEX03xs0aRTXddZ8Ix73l92xFSDaT0hhszBapPHJzyNr3K aSZ2VhYEgXQhuGO++DQV8ZZrLh8ZSFl87Da3WYGf3pRPvFCc45jPvP2xOKbojc7dJJR/ IV7OWJdY+UeXIgTen/3BsQ759YGHAYYgQ5usgALwwakTpw50ah0SbC9id/kZ0dIJZdyR Pb6r53TdYyHSWF+hhVVGnZ3F0/70pU6yoEwiF4CZlY16EHgAJGIK+/s0BdtHWzO5CE68 CKc6dqkJ6DeMa8x0XXDVxMNqEQLV1gjr219tiYT8/bonfQj5OIyBBDl0f0OA6TpqhE7C bjyA== 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; bh=7ATSlDml04RtK4bZEzwPkz9XSwfh2pVDONM2uQX3sVU=; b=cTa9L+xHOKQy25VdlA/KSmlVsShRurHIf4kOdoTuGNaSm97g5PJuZGr4VNdtnF+I8B t4Hi3aSLB38l04T1lBnb87uAfrpURaptnbQqNhE9GvzVKATkGJTqVOWaRSgfLhXm9rcf qbSIrZn9UwDpCEWjpm+ljhh96XsFs9Qxk3lOf/inspsS+xhdTxAXhru99NNkyIPKRNC+ 7oQQ3exewZm64drj/+Us1PKeTMaK/hQCh9rUAAYWI6lJ2Fa8iHzprYac/UzyXPDr4IFN IBtPanXSNf58lake7dA5S1jhqxUpFeMwfL1/VQ7yMk60aYWIfiDGj//++VaScP4RX39m otfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wrWfUlN+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id r126si5651304ywf.15.2019.03.12.10.26.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wrWfUlN+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lAd-00046T-D9 for patch@linaro.org; Tue, 12 Mar 2019 13:26:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2h-0005SB-B0 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzn-0003vE-I1 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:21 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38131) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzn-0003rB-5W for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:19 -0400 Received: by mail-wm1-x332.google.com with SMTP id a188so3441136wmf.3 for ; Tue, 12 Mar 2019 10:15:16 -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=7ATSlDml04RtK4bZEzwPkz9XSwfh2pVDONM2uQX3sVU=; b=wrWfUlN+8lPgtxVlntxWPefhOEpmbK1JA7yHWLm3ZXFnJxyiMowq2xwBkx4We/GypX +gV5MTawJVxaSkZbXpy8MayzGnLrhrHkMVWWllkHOF3SGRlHbvZUVGgyBYBRcSlr35Fb Ys7+pvA/dFNMtKJIdUXO7IqqZoCrfIexjCVkkbP4x4G6H1tDbEyIBDRSm1M1H/k9obqW TIF0NZEDwPdIFYuic/3nRJmirAn3fvKVO13qe3966J5JiF35MJWpewqaQKQ5PipvCgia z47aiDoTWfGI0FqpKvy5T7R6TRmyMhgdeNoMCC7ErV1/eukNOHHqiyBQz+hLKM2auDvT ZRrQ== 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=7ATSlDml04RtK4bZEzwPkz9XSwfh2pVDONM2uQX3sVU=; b=YlHof+p39yKgBcbCcemSYWxMQsYU1c7yCRML6R5V83dOljs0nHDsuZodRUghSA4rx5 fw8MI4VftA1R970doAfgJunPXv4NlksKoIcclLggCjp6bgDqcKEOpEi1uAPkezgjYREY mPByQ2+JmB0B4sofODeRmfIWjy+qJVf/wVOKGh/sFdI/UO9qGPUfvN5m8XzWVRUPimz2 A6oLtxmJTQcVvPt9kU5Ar/WZ9fkQQo3QLy8c1dH+AvMcxkGvIw3IAES6zmt+eZDXF3Na iFkPAKobRqMGXwsG+/5aPvcAFGzeGeDTvIDTs/ZDGh8hWzjLf9tjroZrscCOyanELLm2 Mv8A== X-Gm-Message-State: APjAAAVn9e2Oqzb9k8lmhQjnmejBQ95sXpUaWUf/m1sykR/VQhxOWJ9h TqEUm67kL7W1TTK+oatAppQRd25SFYg= X-Received: by 2002:a05:600c:2144:: with SMTP id v4mr3140178wml.4.1552410915028; Tue, 12 Mar 2019 10:15:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d5sm3575967wrx.12.2019.03.12.10.15.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F384E1FF99; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:17 +0000 Message-Id: <20190312170931.25013-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::332 Subject: [Qemu-devel] [PULL 12/26] tests/docker: add debian-xtensa-cross image 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, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Xtensa cpu supported: - dc232b - dc233c - csp Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker new file mode 100644 index 0000000000..afd2ab9163 --- /dev/null +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -0,0 +1,31 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the debian stretch base image, +# using a prebuilt toolchains for Xtensa cores from: +# https://github.com/foss-xtensa/toolchain/releases +# +FROM debian:stretch-slim + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + curl \ + flex \ + gettext \ + git \ + python-minimal + +ENV CPU_LIST csp dc232b dc233c +ENV TOOLCHAIN_RELEASE 2018.02 + +RUN for cpu in $CPU_LIST; do \ + curl -#SL http://github.com/foss-xtensa/toolchain/releases/download/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz \ + | tar -xzC /opt; \ + done + +ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-csp-elf/bin diff --git a/tests/tcg/xtensa/Makefile.include b/tests/tcg/xtensa/Makefile.include new file mode 100644 index 0000000000..423c00a5d3 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.include @@ -0,0 +1,11 @@ +# Makefile.include for xtensa targets +# +# The compilers can only be used for building system tests + +ifeq ($(CONFIG_SOFTMMU),y) +DOCKER_IMAGE=debian-xtensa-cross + +# default to the dc232b cpu +DOCKER_CROSS_COMPILER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc +DOCKER_CROSS_LINKER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-ld +endif From patchwork Tue Mar 12 17:09:18 2019 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: 160157 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13375557jad; Tue, 12 Mar 2019 10:38:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxOv63rohEsrpgBM3LkfH/Irsbm0/vLVKgw730Lahti9/JznIgeyUdd0xt13cwmxOZ2zx7 X-Received: by 2002:a0d:ca47:: with SMTP id m68mr13773294ywd.217.1552412327322; Tue, 12 Mar 2019 10:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412327; cv=none; d=google.com; s=arc-20160816; b=TilmqXTb1n5ULcjCAUOyfUnmxeozF8FutYST+biX0kXqZKVWE5+0bz0RhONqd7k/bd FpavPeJj5lrbStMQCizeKmIoM/fpNEGPErS+x4gEeb12baG6mHbmlrq7wtWAomqrAJSn T5fNVxWN4s08CKA0ysRgCXJD0i0d/NsA6+Vjamhosv91VAjBVFDG7i4eg9Fjzacc4aEJ 5fs+30ri/81PxV1yekJUT/gbqrWPXtGLJAi32eJoX259e28JeSlE8jzz/3chhm38Up5N PtNLkGFzmeAyD9Wr9kFl+R11y7DwPVRoEjfOAB12AjxNXHlUORF69gGtxIHFWTGSXfs0 vR+w== 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; bh=WfX9u8xi2Ou3qZgXk5DZ/ahAT5TsywCrJVvvreILrXw=; b=AFXXbI7mb0kDHOTGRibRNw6p+6B55JJf8HuOSfVtDWPS9+IDr5J3FCcYlu2OYn1KP+ 2Q/RsydfCjgghB1/H39BskSQNK1TTGvoJUHmp8+bMJ5LBOws9XicjJUIB5F8MmCuQbAB 2DAbCymPIllJg4dWs+lMnhvWj3HvLnhNoYiT1Jfmd3XvOYeC/1yqDkmbbfTJxDXXSOvP 8tSIdS4datwYuWNlVdYzZWgQQaAUOj3BiqKHuqWRz0UA928dLv8/XTvQJfwF7par0lRy EFTy7Nb7R8367eLsYqczVBTxZ1NzTpwW6dt34h7TprxSfbMQDOJal88FsZcO/DcCTW6y JCew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ywjPANb8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id r126si5671662ywf.15.2019.03.12.10.38.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:38:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ywjPANb8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lMU-0006GX-OL for patch@linaro.org; Tue, 12 Mar 2019 13:38:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2v-0005Wi-AJ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuQ-00076p-Ne for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:47 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuQ-00075s-Fj for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:46 -0400 Received: by mail-wm1-x32e.google.com with SMTP id n19so3509335wmi.1 for ; Tue, 12 Mar 2019 10:09:46 -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=WfX9u8xi2Ou3qZgXk5DZ/ahAT5TsywCrJVvvreILrXw=; b=ywjPANb8SJztgOCKzOiHDqZJsPBwZ1oMSSNoqYURGijEJqG+7ZTVmUA19t+80Ad40p 6IpT8V1JMfFIhSKQoqH9cwRJvdA/K50oBCCKQF4sA79WNRONo/hfJBiaeab3Xzn6xU1x rvuMOTX3fupQCvX4A05cGGCA/kcFsxNHuVYI+c4/r4YvzRayQoKkmTtL7n9AnVjnqh4R 6RRe4kx/ly+6JWqAf0m1G/Yf6IMZRxI/LKgRM6lf8lTG2tKDFdBybhl6cocyk1NZ/uk3 5tfnSggz5mTHu7CpiusAvMpg0snNL5pL5gaoj8oTEh4/f2EfoXtf6JSdyRtGwDsmVdrI onOg== 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=WfX9u8xi2Ou3qZgXk5DZ/ahAT5TsywCrJVvvreILrXw=; b=lhxwP0VxBrT9XcU4Rw8XjPUQwrSio0Wubd1uVebWuG7MUFO5Ro0ZCLL5FERml99Gqy 2P5270r/7gsta4XNR5yoMKbyqFRxghCSmy/edzTxqgPKJkYYVagumHkNB30TlY/tsWnQ jZMdU0odNhkYk8Ek7RDSvffmU+icY4ROsElDl7jjX74o+1grG9P9hcG5ZmwfLIWXaHFv SbdTyI2YytmkhCc4ZzqwiPqwtC6+OPmliKknmlltaTgdpRReu0hD/PmvviVVvLzr+b0U YlugMq+6gn2SxxiI4/Zb/89JC0PYyQcPwX9FVTBYefIdtCinrJOOeTpEdN8j8kDJHUDO fYrA== X-Gm-Message-State: APjAAAWm/BCtItkh328Tc+ZZLtH3P4KCULjvRpGqwkvJE58GcVDSoTyG YY4vfEHGEfRZS3zOhXoJN+j2iokqaQc= X-Received: by 2002:a1c:2743:: with SMTP id n64mr574747wmn.143.1552410585246; Tue, 12 Mar 2019 10:09:45 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s12sm3052553wro.67.2019.03.12.10.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B3E61FF9A; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:18 +0000 Message-Id: <20190312170931.25013-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32e Subject: [Qemu-devel] [PULL 13/26] tests/tcg/xtensa: enable system tests 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" Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile deleted file mode 100644 index 2bd4491769..0000000000 --- a/tests/tcg/xtensa/Makefile +++ /dev/null @@ -1,102 +0,0 @@ --include ../../../config-host.mak - -CORE=dc232b -CROSS=xtensa-$(CORE)-elf- - -ifndef XT -SIM = ../../../xtensa-softmmu/qemu-system-xtensa -SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel -SIMDEBUG = -s -S -else -SIM = xt-run -SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS) -SIMDEBUG = --gdbserve=0 -endif - -HOST_CC = gcc -CC = $(CROSS)gcc -AS = $(CROSS)gcc -x assembler-with-cpp -LD = $(CROSS)ld - -ASFLAGS = -Wa,--no-absolute-literals -vectors_ASFLAGS = -mtext-section-literals - -XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa -INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE) -XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) - -LDFLAGS = -Tlinker.ld - -CRT = crt.o vectors.o - -TESTCASES += test_b.tst -TESTCASES += test_bi.tst -TESTCASES += test_boolean.tst -TESTCASES += test_break.tst -TESTCASES += test_bz.tst -TESTCASES += test_cache.tst -TESTCASES += test_clamps.tst -TESTCASES += test_extui.tst -TESTCASES += test_fail.tst -TESTCASES += test_flix.tst -TESTCASES += test_fp0_arith.tst -TESTCASES += test_fp0_conv.tst -TESTCASES += test_fp1.tst -TESTCASES += test_fp_cpenable.tst -TESTCASES += test_interrupt.tst -TESTCASES += test_loop.tst -TESTCASES += test_lsc.tst -TESTCASES += test_mac16.tst -TESTCASES += test_max.tst -TESTCASES += test_min.tst -TESTCASES += test_mmu.tst -TESTCASES += test_mul16.tst -TESTCASES += test_mul32.tst -TESTCASES += test_nsa.tst -TESTCASES += test_phys_mem.tst -ifdef XT -TESTCASES += test_pipeline.tst -endif -TESTCASES += test_quo.tst -TESTCASES += test_rem.tst -TESTCASES += test_rst0.tst -TESTCASES += test_s32c1i.tst -TESTCASES += test_sar.tst -TESTCASES += test_sext.tst -TESTCASES += test_shift.tst -TESTCASES += test_sr.tst -TESTCASES += test_timer.tst -TESTCASES += test_windowed.tst - -all: build - -linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S - $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.c - $(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.S - $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile - $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ - -build: $(TESTCASES) - -check: $(addprefix run-, $(TESTCASES)) - -run-%.tst: %.tst - $(SIM) $(SIMFLAGS) ./$< - -run-test_fail.tst: test_fail.tst - ! $(SIM) $(SIMFLAGS) ./$< - -debug-%.tst: %.tst - $(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$< - -host-debug-%.tst: %.tst - gdb --args $(SIM) $(SIMFLAGS) ./$< - -clean: - $(RM) -fr $(TESTCASES) $(CRT) linker.ld diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target new file mode 100644 index 0000000000..86bb47db77 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,42 @@ +# +# Xtensa softmmu tests +# + +ifneq ($(TARGET_WORDS_BIGENDIAN),y) + +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa +XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S)) +XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL)) +# Filter out common blobs and broken tests +XTENSA_BROKEN_TESTS = crt vectors test_boolean test_pipeline test_fail +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS)) + +# add to the list of tests +TESTS += $(XTENSA_USABLE_TESTS) +VPATH += $(XTENSA_SRC) + +CORE=dc232b +QEMU_OPTS+=-M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel + +INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE) +XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) + +vectors_ASFLAGS = -mtext-section-literals +ASFLAGS = -Wa,--no-absolute-literals +LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib + +CRT = crt.o vectors.o + +linker.ld: linker.ld.S + $(CC) $(XTENSA_INC) -E -P $< -o $@ + +$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target + +# special rule for common blobs +%.o: %.S + $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@ + +%: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + +endif From patchwork Tue Mar 12 17:09:19 2019 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: 160147 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13363341jad; Tue, 12 Mar 2019 10:26:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWo8X4GXVgzAXqpuoLcy7q0W6jqBSz4bQZqtrJgExLIWLIf0VUXW3+MWZ+ihGYFHrGnsKK X-Received: by 2002:a5b:bc6:: with SMTP id c6mr4331091ybr.204.1552411593545; Tue, 12 Mar 2019 10:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411593; cv=none; d=google.com; s=arc-20160816; b=sGNoGk0x+VpKIk/yLRNaC945zvR/1y4NLDzz6na/stHCCpfcEvSiNNUFysmqsE/1gI SlSlI0TNCqS8yITJng2VNMuZDJh9HtffL6WhQHQQ/A3k5E1auVRT7iSPRo84cetqZXBF CX4a4V05uKwRAhELipX7DbJSAcaa7IXUktqUqbMMvgtMFZVlKxTQZgsXEi3wzbRjIdei Q99Bi4dbehdLQgFCm61OPPl7YI6PfWlkCFUoVt50/cj8V1ptP+o1kfNufzCJl0YsN2PE PxFExy1lo0DYYnlRyOSDiEeCq7gXh9rRcFXxM9na42YOzansXzoSES+vv+Qrg2SciAV0 Ir8A== 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; bh=qRLsp/3lgMxKO9xRJaoxtyszjY2dwy5EyF7jsu4zWSM=; b=x/mPBtK6PzqCcORIUy8DVv3uvzGRNkh/qgpGKSg/ozR8O8nYZSJBLITlz7WgDjvziK ebq1e7Bp3uAi7y7WKtEivoqfo6Hpi2/vUExephHDW83Q7+tIj2wD9zlPxvaAtXPRbDLP YqfkFZnjS6G+0kGZAt9baerj+z33LR6sDhyVF7iTs8lmBAK7T0HLCVwyfYxwv9HjlViy AVFjRWZBlaC3pGMFQL0qloxLEi1O3T0oCGLxZAi7j6nxikRVwrsTAAGPt8LdaRca+wBQ HlbPxz8TX4wI6G4BmVfYcvkHS45b8q+WZmvereC6W33Js4zWSifaxV3+ZTT5NCfNMT1D EOfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fz3p7xlT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id y62si5518782ywc.117.2019.03.12.10.26.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:26:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fz3p7xlT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lAe-00052e-Ti for patch@linaro.org; Tue, 12 Mar 2019 13:26:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2v-0005UY-2t for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuR-00077n-H8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:48 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35940) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuR-00076t-8u for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:47 -0400 Received: by mail-wm1-x32f.google.com with SMTP id e16so3353777wme.1 for ; Tue, 12 Mar 2019 10:09: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=qRLsp/3lgMxKO9xRJaoxtyszjY2dwy5EyF7jsu4zWSM=; b=Fz3p7xlTiEV8c/idFxi+T/sRKXjgNUIEY7wFJCvJR5zXzNch1GeU9WQ+9nQCQEYggr dUFBT+qu6i6CElYCSO3wTGq7rmgKs9poR9NZ4WnFX+/Zt01vX38ghTzizTxibx5/BHc3 aKp8dXZlhFVUySfSxut64yeEzTd7J85bJY/dV6uI5UBIphYIx7Z2mhD6QbN/huVpvD6l wCigzDupg6x8JGB6KzNcJp7uKg2nxwqtD/UXzK0JVnzHwSBZdTxrhCb4ZHe6l2UCuacZ WspcptIeLvIUd4Z5C2hvYvV594czp7bEQ1UVtnh27MkLi/oSBUzYJpAO/w45BLKa+1Y1 ilwQ== 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=qRLsp/3lgMxKO9xRJaoxtyszjY2dwy5EyF7jsu4zWSM=; b=Ia0fz4mD6WGonZT6j7wHyYbUV1BtkPzprYiEBEjT6cfVRPCbHHk/EXnSCuicCP+e3v uExEK8VgjQ88oEe8enNivvNOJRMNqSDMxnokb9cRnJiL843JptQzEPWidRElq2uMSSl0 otg/IdJbvpqvU01JsOasyi1qXXV8WNY3w3FacRpKHoVaTKjHAOFaRFHPKPh31ssTKMFh /0l8nDu950J0Omc3tnZxiAMK4B8lH6e3jClwHTuPlLOtbLom77TP+USw5lX1APLsX000 O/67LaxfNyvKR81BR59DsHU+qtrrBbirGg+5OADf6pjIr7v2PPWudH6kFmyuj1XYoLA6 gBxg== X-Gm-Message-State: APjAAAUm5MNUHOAJtrdoJJsxaqP8IuTFOw5uEqLBv3gVIyEBRiv8Z9t7 coUYvDokJlIwK76pg2C/bgPq7A== X-Received: by 2002:a1c:6483:: with SMTP id y125mr131684wmb.12.1552410586221; Tue, 12 Mar 2019 10:09:46 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e193sm7678311wmg.18.2019.03.12.10.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 179BB1FF9B; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:19 +0000 Message-Id: <20190312170931.25013-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 14/26] tests/tcg/arm: add ARMv6-M UNDEFINED 32-bit instruction test 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, Stefan Hajnoczi Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi Test that 32-bit instructions declared UNDEFINED in the ARMv6-M Reference Manual really do raise an exception. Also test that the 6 32-bit instructions defined in the ARMv6-M Reference Manual do not raise an exception. Based-on: <20181029194519.15628-1-stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi Message-Id: <20181129185113.30353-1-stefanha@redhat.com> [AJB: integrated into system tests] Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target new file mode 100644 index 0000000000..49d48d8a1c --- /dev/null +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -0,0 +1,29 @@ +# -*- Mode: makefile -*- +# +# ARM SoftMMU tests - included from tests/tcg/Makefile +# + +ifeq ($(TARGET_ABI_DIR),arm) + +ARM_SRC=$(SRC_PATH)/tests/tcg/arm + +# Set search path for all sources +VPATH += $(ARM_SRC) + +ARM_TESTS=test-armv6m-undef + +TESTS += $(ARM_TESTS) + +CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp +LDFLAGS+=-nostdlib -N -static + +%: %.S %.ld + $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld + +# Specific Test Rules + +test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 + +run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel + +endif diff --git a/tests/tcg/arm/test-armv6m-undef.S b/tests/tcg/arm/test-armv6m-undef.S new file mode 100644 index 0000000000..d18ca56b4a --- /dev/null +++ b/tests/tcg/arm/test-armv6m-undef.S @@ -0,0 +1,154 @@ +/* + * Test ARMv6-M UNDEFINED 32-bit instructions + * + * Copyright 2018 Red Hat Inc. + * + * This work is licensed under the terms of the GNU GPL, version 2 + * or later. See the COPYING file in the top-level directory. + */ + +/* + * Test that UNDEFINED 32-bit instructions fault as expected. This is an + * interesting test because ARMv6-M shares code with its more fully-featured + * siblings and it's necessary to verify that its limited instruction set is + * emulated correctly. + * + * The emulator must be invoked with -semihosting so that the test case can + * terminate with exit code 0 on success or 1 on failure. + * + * Failures can be debugged with -d in_asm,int,exec,cpu and the + * gdbstub (-S -s). + */ + +.syntax unified +.cpu cortex-m0 +.thumb + +/* + * Memory map + */ +#define SRAM_BASE 0x20000000 +#define SRAM_SIZE (16 * 1024) + +/* + * Semihosting interface on ARM T32 + * See "Semihosting for AArch32 and AArch64 Version 2.0 Documentation" by ARM + */ +#define semihosting_call bkpt 0xab +#define SYS_EXIT 0x18 + +vector_table: + .word SRAM_BASE + SRAM_SIZE /* 0. SP_main */ + .word exc_reset_thumb /* 1. Reset */ + .word 0 /* 2. NMI */ + .word exc_hard_fault_thumb /* 3. HardFault */ + .rept 7 + .word 0 /* 4-10. Reserved */ + .endr + .word 0 /* 11. SVCall */ + .word 0 /* 12. Reserved */ + .word 0 /* 13. Reserved */ + .word 0 /* 14. PendSV */ + .word 0 /* 15. SysTick */ + .rept 32 + .word 0 /* 16-47. External Interrupts */ + .endr + +exc_reset: +.equ exc_reset_thumb, exc_reset + 1 +.global exc_reset_thumb + /* The following 32-bit UNDEFINED instructions are tested by executing + * them. The HardFault exception handler should execute and return to + * the next test case. If no exception is raised the test fails. + */ + + /* Table A5-9 32-bit Thumb encoding */ + .short 0b1110100000000000 + .short 0b0000000000000000 + b not_reached + .short 0b1110100000000000 + .short 0b1000000000000000 + b not_reached + .short 0b1111100000000000 + .short 0b0000000000000000 + b not_reached + .short 0b1111100000000000 + .short 0b1000000000000000 + b not_reached + .short 0b1111000000000000 + .short 0b0000000000000000 + b not_reached + + /* Table A5-10 Branch and miscellaneous control instructions */ + .short 0b1111011111110000 + .short 0b1010000000000000 + b not_reached + + /* The following are valid 32-bit instructions that must not raise a + * HardFault. + */ + + /* B4.2.3 Move to Special Register (moves to IPSR are ignored) */ + msr ipsr, r0 + b 1f + b not_reached +1: + /* B4.2.2 Move from Special Register */ + mrs r0, ipsr + b 1f + b not_reached +1: + /* A6.7.13 Branch with Link (immediate) */ + bl 1f +1: + b 1f + b not_reached +1: + /* A6.7.21 Data Memory Barrier */ + dmb + b 1f + b not_reached +1: + /* A6.7.22 Data Synchronization Barrier */ + dsb + b 1f + b not_reached +1: + /* A6.7.24 Instruction Memory Barrier */ + isb + b 1f + b not_reached +1: + + /* Success! */ + movs r0, 1 + b exit + +not_reached: /* Failure :( */ + movs r0, 0 + b exit + +/* When a HardFault occurs, return to pc+6 (test cases are 3 halfwords long) */ +exc_hard_fault: +.equ exc_hard_fault_thumb, exc_hard_fault + 1 +.global exc_hard_fault_thumb + ldr r0, [sp, 0x18] + adds r0, 6 + str r0, [sp, 0x18] + bx lr + +/* + * exit: Terminate emulator + * @r0: 0 - failure, 1 - success + */ +exit: + movs r1, 0 + cmp r0, 1 + bne 1f + ldr r1, ADP_Stopped_ApplicationExit +1: + movs r0, SYS_EXIT + semihosting_call +.align 2 +ADP_Stopped_ApplicationExit: + .word 0x20026 diff --git a/tests/tcg/arm/test-armv6m-undef.ld b/tests/tcg/arm/test-armv6m-undef.ld new file mode 100644 index 0000000000..43dbbf17d5 --- /dev/null +++ b/tests/tcg/arm/test-armv6m-undef.ld @@ -0,0 +1,21 @@ +ENTRY(exc_reset_thumb) + +SECTIONS +{ + . = 0x0; + .text : { + *(.text) + } + .data : { + *(.data) + } + .rodata : { + *(.rodata) + } + .bss : { + *(.bss) + } + /DISCARD/ : { + *(.ARM.attributes) + } +} From patchwork Tue Mar 12 17:09:20 2019 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: 160153 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13369719jad; Tue, 12 Mar 2019 10:32:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqympTgSts+I+Jba5U1SgCafcn9fOIHoFTdpMt7bR2dK3bVAnwoJVV2b1LtoXHlZRglPjVgB X-Received: by 2002:a81:2fc1:: with SMTP id v184mr30826350ywv.129.1552411964066; Tue, 12 Mar 2019 10:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411964; cv=none; d=google.com; s=arc-20160816; b=dMJK62uWsfrSgb4urb9IzGSEWRXs/xQhaBJzRaYBLA+qnEGsjvf2zbtvQEWq/CSl4L o8lqUVXxi2sbJeCsTSr1lpQoChJZl57A+uHk0YF5/0ou0fEhtcKeyE5hbDz1JITPDTw4 PcWCETMb2MbQqIaSowdy0AG6XPzfFyARPaEZeazp3UCGpJ8LugM3anqfNhFIK/QUeR48 7KsPhuVp4ZvY3y3Wqtxz+RTB8IZX/fwzKxUIk+sbaGGnAoZbTzixVHxYfmypNkMSvPT7 RJPfLi3GYPV1ahK9f2KXuBVufGH3hurJxIxe3HScPcQdMPyUAEGkTGJ/JnWp8JGajxMq CpJA== 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; bh=kXpJsNkMQW4r2dtxY1UWgekR/mdfY68iOjYQtXehlLI=; b=v02gTGi7sDuYgxAMzq0gNZU0qMEFVf7RFVgj9iFKldJYz15UEhJbB19Sim+axXu863 UnuNb8r+WYNZdvKXQuryrlzIHWbn+d5IRS+i88NRuxKLW3Oyo4v5x4mIt75UPqDdtP3o LGlnkLSOLaVM/9vIn+tCXB6ZNK3IkeeKwbHbITnbmT8lOpFoxYzNYBHOkOwtKlxW5Xnu OdrZ3v7f0j+p9hUeMuAXQJEV55e1dfdLIZKOscbuUDWcrL0aMtK4caZKj6APFWbCyKdS Z1gRRxcrSDYbWORkyyW5r52ND37f+AMHDE6v/FyewpeuT6IJrqxIOYyckVwpGrXuNQuz h2JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eyydjHMI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id 207si5056882yws.62.2019.03.12.10.32.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:32:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eyydjHMI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lGd-0002DB-IU for patch@linaro.org; Tue, 12 Mar 2019 13:32:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2v-0005kf-Au for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuP-00075o-Pq for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:46 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:39607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuP-000752-IH for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:45 -0400 Received: by mail-wm1-x32b.google.com with SMTP id t124so3413441wma.4 for ; Tue, 12 Mar 2019 10:09:45 -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=kXpJsNkMQW4r2dtxY1UWgekR/mdfY68iOjYQtXehlLI=; b=eyydjHMIkIj6E13rV/VUR6P/0M94DiQU/2mqIKxReyGGW8RgHwwYnyqKJyLRRdbp7g 8Oqd1C624B9cRLoqbvLtZDjXZKt1lJlFMhTHR6XkXoNJAsLsBFLpbYVcjRcFhAWFIi2o Qu/1qVNhc5qUMqs4dmKwdXQnIj8Jrmt9/TolS1f8WtmruskvUki1rXGoUwQ0rF2gYxUc OFUEF601itEuDtdTgwP/yb5urbUDL+Nt/V9QRqLiTZ1ZZsNf+N5dfKs2BbBa93IYftXp p1l94eajD22oztmlAM6fW92ud8BKVD9GwiAXAJqxJmlRBuyuCyVMKLUqqB91sGQwWH+0 EpNA== 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=kXpJsNkMQW4r2dtxY1UWgekR/mdfY68iOjYQtXehlLI=; b=fVeCN9CGRF5eqil0sM+AZlkEeuhSwgh1xah3wvg/2eAO03xBNhbUPGgdiT7TtpjoTA dHDqDjPz9gI8dfZT0EKMDjtGel9GFgRI1xsDETC4oYL1AbQH6QHkCBF2SgeOh6rD7Pit ICK0tUoZaLjnglg/o5NcQfZA2OZ8zT+xZpwccyT1kcIIffTuqO8+SK4fcUBgosRZCBj7 bp99JbW9FKPenL8pmBFmKAkwhz9y/lf3ARW3pFP+6jlKGKr9/JtPf6XE3gfKpLag5GV/ HMU2zLaFE8vls2UX36ALj5ZTvDynxm1Uqbz7itD/JRO/qkH8qTum3rPsvH7Zl7kRLmYr 756Q== X-Gm-Message-State: APjAAAWr8KCqvt7yn43Hwo5wFYQTBEio3btazcAaRNf+kdAevJBWt0nd AaHmN0QGknZH5QS1rarf931HnMMQsRA= X-Received: by 2002:a1c:1f51:: with SMTP id f78mr3001327wmf.28.1552410584633; Tue, 12 Mar 2019 10:09:44 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x24sm3286866wmi.5.2019.03.12.10.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 239D91FF9C; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:20 +0000 Message-Id: <20190312170931.25013-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32b Subject: [Qemu-devel] [PULL 15/26] tests/docker: add fedora-cris-cross compilers 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" Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker new file mode 100644 index 0000000000..b168ada615 --- /dev/null +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -0,0 +1,8 @@ +# +# Cross compiler for cris system tests +# + +FROM fedora:latest +ENV PACKAGES gcc-cris-linux-gnu +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt From patchwork Tue Mar 12 17:09:21 2019 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: 160150 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13365895jad; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqygameFyi19lze8LI94IbqXTWoP9jBcEVK3H5BKJOmjrnAKgAgTWvOUjIZWhhHvAvHfNxr2 X-Received: by 2002:a0d:e613:: with SMTP id p19mr9450035ywe.96.1552411754930; Tue, 12 Mar 2019 10:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411754; cv=none; d=google.com; s=arc-20160816; b=yPyCTI528wwKXUcWGLqF+BWjW2xOQ96OakGdzt0JlDSGDGaPqR/DuAFzS+EWVNABje iG+9nsPplbpl0tICiKiki3e6CYScipw0vW1Bh7HFD1ZA2WEZZa40xtRpABtIXq85Bmaj ifJJhwL4C8STVHS98n+0TlQ7WAMWvyGu8FFc5oIwmPzhylQmg3tzzU33YtqU2B0FYKzj EfW1MOGH3n5Yfk6I5Z68k2G7B4Dp7rNmGZiP+KKDf5gywnbHpSg1NyUQGI6kppxcndVF HlJCppZ0Ex1aBc0YHLla0AT0cF0XlE3zMqhrjYELtZFE1O8NAiQmUG8k5PBrtN8GecVe W81w== 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; bh=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=EpOCiSnoUKnjViCztdeOziH/wcLKOHtunv/2dXtkeBuoI58zH1dFtIe3UFdKQVnMHq UtFTNWzh8ru3+6K6UhT2nSY1JHuLu0qGYMvuzFW8NamNf5z97wUrVrHVV/D6SDc9fr+B 0fyjuRUeW/u5IvH/2tjJuhDg5/xGLLELAJkTw0A+O9C6CMg6DA/zCuOZ+CuIlRnx7l+f VmdzMmGb0UtRnePhL9HBOqmrEzHfUHVeOBjufUeOi0/FCqP+O3WbY37rNxyHdble//wM GZNpvM5ZdRCkkv5EdnRMzgLjnnHTmC8kX0YaSWUpC7K2gFnxFcT7NrNRLjmbkzsFis7m 2Dnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h3eTSzmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id e82si5243924ybe.132.2019.03.12.10.29.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:29:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h3eTSzmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lDG-0006Zp-EN for patch@linaro.org; Tue, 12 Mar 2019 13:29:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2u-0005kf-8z for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuS-000793-Sh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:49 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuS-00078P-L3 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:48 -0400 Received: by mail-wr1-x443.google.com with SMTP id p1so3550256wrs.8 for ; Tue, 12 Mar 2019 10:09:48 -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=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=h3eTSzmiVs5YSzbivF1dvWcMp907i1nicl1g5VTCHUfaSYIFrPg1SYbs3pcuMLyY31 uEIZ76+OUfkH3IYH0vYosJn6lETwna8s7z1HGRlnh+nBJ4IEq1UuTlLCvdkkZbw1ghd4 jYOf5SVJPA7lkZcoQBLV3ygAJWByl3qIEiO0SqlFjzNxbE+t6Irfaip8wnIjxhvosh2i pMQ31NTn3t8+WvS0py/RcwTl9eb2XEstgGJtiRf20q4sDMz8Ao0TXdk/k2ubq+75UFJI s3honkYD82xF6sUIgME9Y7knTJjuqgrcGrFWKoR7AUxK6FBepMwsdJuSfy9LuAxcUZLX S7Bw== 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=BYfZmpe2piTIkl/J5xCfiY8Arya/eDd3uCzhP6JB7/0=; b=Mz+dc1+05dZzAG2nOwU/PnlmhTmZqBQv8tWlzak+/U9r9E0TDqTySklz91W8sgutYT sIiyOy5qKX7Tk1A1ScjeJtMyB/Kxfp+/dEASuAV+XeJu+STWwSC779GeG+hcEMqOAZ3B XfNszNktARlgHhmvuW/XniXAvaKgoyjC7nXv6UYSiAKqLNf0OvfzulGCXhmWjRj/no6B xsTwvVIEYO6yKptrV1tIe5zbcbz0PyPqDl+N32Po9MYQ/9ofaxABEI/y6nHQi2VtLU8o ySF9Gu5b5h3mH1IZvYQlbvHT9sBUbGbgiWNb3oEq/IbIDV//HIfdpYHickiRfyaNW983 YvHQ== X-Gm-Message-State: APjAAAVZdaOCwgqyxGh5C5kAP2JSxT7qYuLZZgerUjy+ZsOHL3j1GXtx wo+M6sJzLLSsOEv62IxUWl91tw== X-Received: by 2002:adf:f4d0:: with SMTP id h16mr25654567wrp.103.1552410587371; Tue, 12 Mar 2019 10:09:47 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g10sm12722474wrq.61.2019.03.12.10.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ED611FF9D; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:21 +0000 Message-Id: <20190312170931.25013-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::443 Subject: [Qemu-devel] [PULL 16/26] tests/tcg/cris: cleanup sys.c 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" This is a mini library which provides helper functions to the tests which are all currently written in assembly. A bunch of minor changes: - removed libc related headers (fedora-cris-cross is a system compiler) - re-organised the functions to avoid forward declarations - cleaned up brace usage - restored exit for _fail case - removed tabs and fixed indentation Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/sys.c index 21f08c0747..1644eecc33 100644 --- a/tests/tcg/cris/sys.c +++ b/tests/tcg/cris/sys.c @@ -1,59 +1,63 @@ -#include -#include -#include - -static inline int mystrlen(char *s) { - int i = 0; - while (s[i]) - i++; - return i; +/* + * Helper functions for CRIS system tests + * + * There is no libc and only a limited set of headers. + */ + +#include + +void exit(int status) +{ + register unsigned int callno asm ("r9") = 1; /* NR_exit */ + + asm volatile ("break 13\n" + : /* no outputs */ + : "r" (callno) + : "memory"); + while (1) { + /* do nothing */ + }; } -void pass(void) { - char s[] = "passed.\n"; - write (1, s, sizeof (s) - 1); - exit (0); -} +size_t write(int fd, const void *buf, size_t count) +{ + register unsigned int callno asm ("r9") = 4; /* NR_write */ + register unsigned int r10 asm ("r10") = fd; + register const void *r11 asm ("r11") = buf; + register size_t r12 asm ("r12") = count; + register unsigned int r asm ("r10"); -void _fail(char *reason) { - char s[] = "\nfailed: "; - int len = mystrlen(reason); - write (1, s, sizeof (s) - 1); - write (1, reason, len); - write (1, "\n", 1); -// exit (1); -} + asm volatile ("break 13\n" + : "=r" (r) + : "r" (callno), "0" (r10), "r" (r11), "r" (r12) + : "memory"); -void *memset (void *s, int c, size_t n) { - char *p = s; - int i; - for (i = 0; i < n; i++) - p[i] = c; - return p; + return r; } -void exit (int status) { - register unsigned int callno asm ("r9") = 1; /* NR_exit */ - - asm volatile ("break 13\n" - : - : "r" (callno) - : "memory" ); - while(1) - ; +static inline int mystrlen(char *s) +{ + int i = 0; + while (s[i]) { + i++; + } + return i; } -ssize_t write (int fd, const void *buf, size_t count) { - register unsigned int callno asm ("r9") = 4; /* NR_write */ - register unsigned int r10 asm ("r10") = fd; - register const void *r11 asm ("r11") = buf; - register size_t r12 asm ("r12") = count; - register unsigned int r asm ("r10"); - asm volatile ("break 13\n" - : "=r" (r) - : "r" (callno), "0" (r10), "r" (r11), "r" (r12) - : "memory"); +void pass(void) +{ + char s[] = "passed.\n"; + write(1, s, sizeof(s) - 1); + exit(0); +} - return r; +void _fail(char *reason) +{ + char s[] = "\nfailed: "; + int len = mystrlen(reason); + write(1, s, sizeof(s) - 1); + write(1, reason, len); + write(1, "\n", 1); + exit(1); } From patchwork Tue Mar 12 17:09:22 2019 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: 160138 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13200675oce; Tue, 12 Mar 2019 10:21:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwu0P3SPOrUrbltvXdsLhaxaJOU70Vnf4tAtPibdtNnKxVV3sXymK2N/HQjEd0s2sRGbJbg X-Received: by 2002:a5b:e83:: with SMTP id z3mr18112640ybr.89.1552411281204; Tue, 12 Mar 2019 10:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411281; cv=none; d=google.com; s=arc-20160816; b=DINrUmFdyhL8q4u5r9PYXqFXt6KH4Vsm6qKYpqqIHVHL84tXam7ilB7QqiAudr5s61 Yyf1qDQHPmpuzBlwYrCfkjQuAaZKvmgi/WWQYM15eibSJ4ZuOhru/ZspFPj96DqZFsTg oeSCgnl/9ZYFK5uetLCodaDzEGkIs1gclDy3XMyPFI1P7VUASFJyZwfXXiAUNp6paIXE 0y6izWtOZndWx0cQnq4ZpfSxaDFLAu+sRktrH8XYOeZK/UwSnvoSmUM6YCX4TaSWI5kZ N3QXM/UjSYCyqLVdLQKEUOU4hH+DnLYAHJ9oZzsG/s80G+9bG5Xq9uZJJlMICAiVqDKR uFrw== 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; bh=FD2F0OeiAyQriEnUY6hXc1wLGlMkaXRoFOqcpDCxbiY=; b=PrCmv3x+82pOXHtydTJmkfZVki9tTpTT4A5PfNiMWd7X3vennQLMcYsYxQqXlbaKWL ykBEPFtWKtevwzxdR8086Fhycpeeqsqv9ocVkHbDd84hRwXeqkdVCJGaER75de/V619S 73j9jiVgb0hlijl2kjRkDeEkDzXnhShrENe3FlezXSICaiC+CS/CL1TIAu3ghXpvak2Z AtaHkeQS2OmHrXeQYeiesRRFK6aDln2gDThr7GSIIHHQYVF5rmTSa3/YEI+3hVDhBFzt plE5MKhk+ZIgl5DQ/SYxoCr8nrreZUbIc8AmbREUuNn9OouqIMTddlvRQlNwWudwa9c2 litw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KHj877iN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id s64si4826078ywb.247.2019.03.12.10.21.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KHj877iN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l5c-0007O6-Hx for patch@linaro.org; Tue, 12 Mar 2019 13:21:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2g-0005UY-0n for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003u5-RM for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:22 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003qL-Cw for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wr1-x444.google.com with SMTP id f14so3611508wrg.1 for ; Tue, 12 Mar 2019 10:15:14 -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=FD2F0OeiAyQriEnUY6hXc1wLGlMkaXRoFOqcpDCxbiY=; b=KHj877iNwMKNHssZBBMCN3nyKlFO83ug4rJePoiSqSi6DQ5dWhfQEzCx6LQ7f05yNs 6/Tt+2s3RTayTDucgp1sRV+oJqtIs4six9a8QGjbDuUoO+KCe4bqgyms0u9Cd5zA1Huq oCeQjP0U6KCEGI/TRr9Sky+HYuCGWhXaO7PG+UKro30L3URTL7go64UU5//OsvhtYr74 mmKnmfPBnO7ReTc63Vmto6kJ6b7voTFmghBppdh0HgHF0niEcnAQGsns5IDTA+Ia7APv z5CxVK0Lvdor5xSFAoKe2jUSOTr5HLhxCcPh6ZFojBfSyYQVYsikuUOZt9yFWOs+rMHr oQAA== 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=FD2F0OeiAyQriEnUY6hXc1wLGlMkaXRoFOqcpDCxbiY=; b=FZUwVnHEP+jeeP7e9zaReqKCSECX2FrBScXu6tMBsMW29MY7LyryhQzDAA2k1Chw5O xjN4oAhx+7cbG3LCSF6f3th45VUgBwook4kg98np6QJmX68UK+n2Up8utbSvuQ6L6jBy pAeP2Of8gfB1x14M6BWBJXneCA2XEKK6JJM22lJDU1X76joYxGCyy8lOZttyBe/RS4lM LJ6IGJAeNqFK6xxhloj66QVaT1xpFteMyWLEKY781Si2zI0pSURYYTrxFWkhAEntYxZN k1BcAMII2JySfMiFcVV6IXtQ/Ch3EJcemaz3zKAYJ9SoIuLK3FpCXxLSIBuouilG736k E+dQ== X-Gm-Message-State: APjAAAXGAly3+ycmgqYQ439g8m+Uj9SruuXiwyObH7BeaN75P034tX/v Ek49m1Z+lr50f5KjDwgEXosBKXnPCY0= X-Received: by 2002:adf:f80c:: with SMTP id s12mr22310780wrp.150.1552410913460; Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e16sm8312412wrw.84.2019.03.12.10.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3B0ED1FF9E; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:22 +0000 Message-Id: <20190312170931.25013-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::444 Subject: [Qemu-devel] [PULL 17/26] tests/tcg: split cris tests into bare and libc directories 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" Bare tests are standalone assembly tests that don't require linking to any libc and hence can be built with kernel only compilers. The libc tests need a compiler capable of building properly linked userspace binaries. As we don't have such a cross compiler at the moment we won't be building those tests. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/cris/check_addcv17.s b/tests/tcg/cris/bare/check_addcv17.s similarity index 100% rename from tests/tcg/cris/check_addcv17.s rename to tests/tcg/cris/bare/check_addcv17.s diff --git a/tests/tcg/cris/check_addi.s b/tests/tcg/cris/bare/check_addi.s similarity index 100% rename from tests/tcg/cris/check_addi.s rename to tests/tcg/cris/bare/check_addi.s diff --git a/tests/tcg/cris/check_addiv32.s b/tests/tcg/cris/bare/check_addiv32.s similarity index 100% rename from tests/tcg/cris/check_addiv32.s rename to tests/tcg/cris/bare/check_addiv32.s diff --git a/tests/tcg/cris/check_addm.s b/tests/tcg/cris/bare/check_addm.s similarity index 100% rename from tests/tcg/cris/check_addm.s rename to tests/tcg/cris/bare/check_addm.s diff --git a/tests/tcg/cris/check_addq.s b/tests/tcg/cris/bare/check_addq.s similarity index 100% rename from tests/tcg/cris/check_addq.s rename to tests/tcg/cris/bare/check_addq.s diff --git a/tests/tcg/cris/check_addr.s b/tests/tcg/cris/bare/check_addr.s similarity index 100% rename from tests/tcg/cris/check_addr.s rename to tests/tcg/cris/bare/check_addr.s diff --git a/tests/tcg/cris/check_addxc.s b/tests/tcg/cris/bare/check_addxc.s similarity index 100% rename from tests/tcg/cris/check_addxc.s rename to tests/tcg/cris/bare/check_addxc.s diff --git a/tests/tcg/cris/check_addxm.s b/tests/tcg/cris/bare/check_addxm.s similarity index 100% rename from tests/tcg/cris/check_addxm.s rename to tests/tcg/cris/bare/check_addxm.s diff --git a/tests/tcg/cris/check_addxr.s b/tests/tcg/cris/bare/check_addxr.s similarity index 100% rename from tests/tcg/cris/check_addxr.s rename to tests/tcg/cris/bare/check_addxr.s diff --git a/tests/tcg/cris/check_andc.s b/tests/tcg/cris/bare/check_andc.s similarity index 100% rename from tests/tcg/cris/check_andc.s rename to tests/tcg/cris/bare/check_andc.s diff --git a/tests/tcg/cris/check_andm.s b/tests/tcg/cris/bare/check_andm.s similarity index 100% rename from tests/tcg/cris/check_andm.s rename to tests/tcg/cris/bare/check_andm.s diff --git a/tests/tcg/cris/check_andq.s b/tests/tcg/cris/bare/check_andq.s similarity index 100% rename from tests/tcg/cris/check_andq.s rename to tests/tcg/cris/bare/check_andq.s diff --git a/tests/tcg/cris/check_andr.s b/tests/tcg/cris/bare/check_andr.s similarity index 100% rename from tests/tcg/cris/check_andr.s rename to tests/tcg/cris/bare/check_andr.s diff --git a/tests/tcg/cris/check_asr.s b/tests/tcg/cris/bare/check_asr.s similarity index 100% rename from tests/tcg/cris/check_asr.s rename to tests/tcg/cris/bare/check_asr.s diff --git a/tests/tcg/cris/check_ba.s b/tests/tcg/cris/bare/check_ba.s similarity index 100% rename from tests/tcg/cris/check_ba.s rename to tests/tcg/cris/bare/check_ba.s diff --git a/tests/tcg/cris/check_bas.s b/tests/tcg/cris/bare/check_bas.s similarity index 100% rename from tests/tcg/cris/check_bas.s rename to tests/tcg/cris/bare/check_bas.s diff --git a/tests/tcg/cris/check_bcc.s b/tests/tcg/cris/bare/check_bcc.s similarity index 100% rename from tests/tcg/cris/check_bcc.s rename to tests/tcg/cris/bare/check_bcc.s diff --git a/tests/tcg/cris/check_boundc.s b/tests/tcg/cris/bare/check_boundc.s similarity index 100% rename from tests/tcg/cris/check_boundc.s rename to tests/tcg/cris/bare/check_boundc.s diff --git a/tests/tcg/cris/check_boundr.s b/tests/tcg/cris/bare/check_boundr.s similarity index 100% rename from tests/tcg/cris/check_boundr.s rename to tests/tcg/cris/bare/check_boundr.s diff --git a/tests/tcg/cris/check_btst.s b/tests/tcg/cris/bare/check_btst.s similarity index 100% rename from tests/tcg/cris/check_btst.s rename to tests/tcg/cris/bare/check_btst.s diff --git a/tests/tcg/cris/check_clearfv32.s b/tests/tcg/cris/bare/check_clearfv32.s similarity index 100% rename from tests/tcg/cris/check_clearfv32.s rename to tests/tcg/cris/bare/check_clearfv32.s diff --git a/tests/tcg/cris/check_clrjmp1.s b/tests/tcg/cris/bare/check_clrjmp1.s similarity index 100% rename from tests/tcg/cris/check_clrjmp1.s rename to tests/tcg/cris/bare/check_clrjmp1.s diff --git a/tests/tcg/cris/check_cmp-2.s b/tests/tcg/cris/bare/check_cmp-2.s similarity index 100% rename from tests/tcg/cris/check_cmp-2.s rename to tests/tcg/cris/bare/check_cmp-2.s diff --git a/tests/tcg/cris/check_cmpc.s b/tests/tcg/cris/bare/check_cmpc.s similarity index 100% rename from tests/tcg/cris/check_cmpc.s rename to tests/tcg/cris/bare/check_cmpc.s diff --git a/tests/tcg/cris/check_cmpm.s b/tests/tcg/cris/bare/check_cmpm.s similarity index 100% rename from tests/tcg/cris/check_cmpm.s rename to tests/tcg/cris/bare/check_cmpm.s diff --git a/tests/tcg/cris/check_cmpq.s b/tests/tcg/cris/bare/check_cmpq.s similarity index 100% rename from tests/tcg/cris/check_cmpq.s rename to tests/tcg/cris/bare/check_cmpq.s diff --git a/tests/tcg/cris/check_cmpr.s b/tests/tcg/cris/bare/check_cmpr.s similarity index 100% rename from tests/tcg/cris/check_cmpr.s rename to tests/tcg/cris/bare/check_cmpr.s diff --git a/tests/tcg/cris/check_cmpxc.s b/tests/tcg/cris/bare/check_cmpxc.s similarity index 100% rename from tests/tcg/cris/check_cmpxc.s rename to tests/tcg/cris/bare/check_cmpxc.s diff --git a/tests/tcg/cris/check_cmpxm.s b/tests/tcg/cris/bare/check_cmpxm.s similarity index 100% rename from tests/tcg/cris/check_cmpxm.s rename to tests/tcg/cris/bare/check_cmpxm.s diff --git a/tests/tcg/cris/check_dstep.s b/tests/tcg/cris/bare/check_dstep.s similarity index 100% rename from tests/tcg/cris/check_dstep.s rename to tests/tcg/cris/bare/check_dstep.s diff --git a/tests/tcg/cris/check_jsr.s b/tests/tcg/cris/bare/check_jsr.s similarity index 100% rename from tests/tcg/cris/check_jsr.s rename to tests/tcg/cris/bare/check_jsr.s diff --git a/tests/tcg/cris/check_lapc.s b/tests/tcg/cris/bare/check_lapc.s similarity index 100% rename from tests/tcg/cris/check_lapc.s rename to tests/tcg/cris/bare/check_lapc.s diff --git a/tests/tcg/cris/check_lsl.s b/tests/tcg/cris/bare/check_lsl.s similarity index 100% rename from tests/tcg/cris/check_lsl.s rename to tests/tcg/cris/bare/check_lsl.s diff --git a/tests/tcg/cris/check_lsr.s b/tests/tcg/cris/bare/check_lsr.s similarity index 100% rename from tests/tcg/cris/check_lsr.s rename to tests/tcg/cris/bare/check_lsr.s diff --git a/tests/tcg/cris/check_mcp.s b/tests/tcg/cris/bare/check_mcp.s similarity index 100% rename from tests/tcg/cris/check_mcp.s rename to tests/tcg/cris/bare/check_mcp.s diff --git a/tests/tcg/cris/check_movdelsr1.s b/tests/tcg/cris/bare/check_movdelsr1.s similarity index 100% rename from tests/tcg/cris/check_movdelsr1.s rename to tests/tcg/cris/bare/check_movdelsr1.s diff --git a/tests/tcg/cris/check_movecr.s b/tests/tcg/cris/bare/check_movecr.s similarity index 100% rename from tests/tcg/cris/check_movecr.s rename to tests/tcg/cris/bare/check_movecr.s diff --git a/tests/tcg/cris/check_movei.s b/tests/tcg/cris/bare/check_movei.s similarity index 100% rename from tests/tcg/cris/check_movei.s rename to tests/tcg/cris/bare/check_movei.s diff --git a/tests/tcg/cris/check_movemr.s b/tests/tcg/cris/bare/check_movemr.s similarity index 100% rename from tests/tcg/cris/check_movemr.s rename to tests/tcg/cris/bare/check_movemr.s diff --git a/tests/tcg/cris/check_movemrv32.s b/tests/tcg/cris/bare/check_movemrv32.s similarity index 100% rename from tests/tcg/cris/check_movemrv32.s rename to tests/tcg/cris/bare/check_movemrv32.s diff --git a/tests/tcg/cris/check_mover.s b/tests/tcg/cris/bare/check_mover.s similarity index 100% rename from tests/tcg/cris/check_mover.s rename to tests/tcg/cris/bare/check_mover.s diff --git a/tests/tcg/cris/check_moverm.s b/tests/tcg/cris/bare/check_moverm.s similarity index 100% rename from tests/tcg/cris/check_moverm.s rename to tests/tcg/cris/bare/check_moverm.s diff --git a/tests/tcg/cris/check_movmp.s b/tests/tcg/cris/bare/check_movmp.s similarity index 100% rename from tests/tcg/cris/check_movmp.s rename to tests/tcg/cris/bare/check_movmp.s diff --git a/tests/tcg/cris/check_movpmv32.s b/tests/tcg/cris/bare/check_movpmv32.s similarity index 100% rename from tests/tcg/cris/check_movpmv32.s rename to tests/tcg/cris/bare/check_movpmv32.s diff --git a/tests/tcg/cris/check_movpr.s b/tests/tcg/cris/bare/check_movpr.s similarity index 100% rename from tests/tcg/cris/check_movpr.s rename to tests/tcg/cris/bare/check_movpr.s diff --git a/tests/tcg/cris/check_movprv32.s b/tests/tcg/cris/bare/check_movprv32.s similarity index 100% rename from tests/tcg/cris/check_movprv32.s rename to tests/tcg/cris/bare/check_movprv32.s diff --git a/tests/tcg/cris/check_movscr.s b/tests/tcg/cris/bare/check_movscr.s similarity index 100% rename from tests/tcg/cris/check_movscr.s rename to tests/tcg/cris/bare/check_movscr.s diff --git a/tests/tcg/cris/check_movsm.s b/tests/tcg/cris/bare/check_movsm.s similarity index 100% rename from tests/tcg/cris/check_movsm.s rename to tests/tcg/cris/bare/check_movsm.s diff --git a/tests/tcg/cris/check_movsr.s b/tests/tcg/cris/bare/check_movsr.s similarity index 100% rename from tests/tcg/cris/check_movsr.s rename to tests/tcg/cris/bare/check_movsr.s diff --git a/tests/tcg/cris/check_movucr.s b/tests/tcg/cris/bare/check_movucr.s similarity index 100% rename from tests/tcg/cris/check_movucr.s rename to tests/tcg/cris/bare/check_movucr.s diff --git a/tests/tcg/cris/check_movum.s b/tests/tcg/cris/bare/check_movum.s similarity index 100% rename from tests/tcg/cris/check_movum.s rename to tests/tcg/cris/bare/check_movum.s diff --git a/tests/tcg/cris/check_movur.s b/tests/tcg/cris/bare/check_movur.s similarity index 100% rename from tests/tcg/cris/check_movur.s rename to tests/tcg/cris/bare/check_movur.s diff --git a/tests/tcg/cris/check_mulv32.s b/tests/tcg/cris/bare/check_mulv32.s similarity index 100% rename from tests/tcg/cris/check_mulv32.s rename to tests/tcg/cris/bare/check_mulv32.s diff --git a/tests/tcg/cris/check_mulx.s b/tests/tcg/cris/bare/check_mulx.s similarity index 100% rename from tests/tcg/cris/check_mulx.s rename to tests/tcg/cris/bare/check_mulx.s diff --git a/tests/tcg/cris/check_neg.s b/tests/tcg/cris/bare/check_neg.s similarity index 100% rename from tests/tcg/cris/check_neg.s rename to tests/tcg/cris/bare/check_neg.s diff --git a/tests/tcg/cris/check_not.s b/tests/tcg/cris/bare/check_not.s similarity index 100% rename from tests/tcg/cris/check_not.s rename to tests/tcg/cris/bare/check_not.s diff --git a/tests/tcg/cris/check_orc.s b/tests/tcg/cris/bare/check_orc.s similarity index 100% rename from tests/tcg/cris/check_orc.s rename to tests/tcg/cris/bare/check_orc.s diff --git a/tests/tcg/cris/check_orm.s b/tests/tcg/cris/bare/check_orm.s similarity index 100% rename from tests/tcg/cris/check_orm.s rename to tests/tcg/cris/bare/check_orm.s diff --git a/tests/tcg/cris/check_orq.s b/tests/tcg/cris/bare/check_orq.s similarity index 100% rename from tests/tcg/cris/check_orq.s rename to tests/tcg/cris/bare/check_orq.s diff --git a/tests/tcg/cris/check_orr.s b/tests/tcg/cris/bare/check_orr.s similarity index 100% rename from tests/tcg/cris/check_orr.s rename to tests/tcg/cris/bare/check_orr.s diff --git a/tests/tcg/cris/check_ret.s b/tests/tcg/cris/bare/check_ret.s similarity index 100% rename from tests/tcg/cris/check_ret.s rename to tests/tcg/cris/bare/check_ret.s diff --git a/tests/tcg/cris/check_scc.s b/tests/tcg/cris/bare/check_scc.s similarity index 100% rename from tests/tcg/cris/check_scc.s rename to tests/tcg/cris/bare/check_scc.s diff --git a/tests/tcg/cris/check_subc.s b/tests/tcg/cris/bare/check_subc.s similarity index 100% rename from tests/tcg/cris/check_subc.s rename to tests/tcg/cris/bare/check_subc.s diff --git a/tests/tcg/cris/check_subm.s b/tests/tcg/cris/bare/check_subm.s similarity index 100% rename from tests/tcg/cris/check_subm.s rename to tests/tcg/cris/bare/check_subm.s diff --git a/tests/tcg/cris/check_subq.s b/tests/tcg/cris/bare/check_subq.s similarity index 100% rename from tests/tcg/cris/check_subq.s rename to tests/tcg/cris/bare/check_subq.s diff --git a/tests/tcg/cris/check_subr.s b/tests/tcg/cris/bare/check_subr.s similarity index 100% rename from tests/tcg/cris/check_subr.s rename to tests/tcg/cris/bare/check_subr.s diff --git a/tests/tcg/cris/check_xarith.s b/tests/tcg/cris/bare/check_xarith.s similarity index 100% rename from tests/tcg/cris/check_xarith.s rename to tests/tcg/cris/bare/check_xarith.s diff --git a/tests/tcg/cris/crt.s b/tests/tcg/cris/bare/crt.s similarity index 100% rename from tests/tcg/cris/crt.s rename to tests/tcg/cris/bare/crt.s diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/bare/sys.c similarity index 100% rename from tests/tcg/cris/sys.c rename to tests/tcg/cris/bare/sys.c diff --git a/tests/tcg/cris/testutils.inc b/tests/tcg/cris/bare/testutils.inc similarity index 100% rename from tests/tcg/cris/testutils.inc rename to tests/tcg/cris/bare/testutils.inc diff --git a/tests/tcg/cris/check_abs.c b/tests/tcg/cris/libc/check_abs.c similarity index 100% rename from tests/tcg/cris/check_abs.c rename to tests/tcg/cris/libc/check_abs.c diff --git a/tests/tcg/cris/check_addc.c b/tests/tcg/cris/libc/check_addc.c similarity index 100% rename from tests/tcg/cris/check_addc.c rename to tests/tcg/cris/libc/check_addc.c diff --git a/tests/tcg/cris/check_addcm.c b/tests/tcg/cris/libc/check_addcm.c similarity index 100% rename from tests/tcg/cris/check_addcm.c rename to tests/tcg/cris/libc/check_addcm.c diff --git a/tests/tcg/cris/check_addo.c b/tests/tcg/cris/libc/check_addo.c similarity index 100% rename from tests/tcg/cris/check_addo.c rename to tests/tcg/cris/libc/check_addo.c diff --git a/tests/tcg/cris/check_addoq.c b/tests/tcg/cris/libc/check_addoq.c similarity index 100% rename from tests/tcg/cris/check_addoq.c rename to tests/tcg/cris/libc/check_addoq.c diff --git a/tests/tcg/cris/check_bound.c b/tests/tcg/cris/libc/check_bound.c similarity index 100% rename from tests/tcg/cris/check_bound.c rename to tests/tcg/cris/libc/check_bound.c diff --git a/tests/tcg/cris/check_ftag.c b/tests/tcg/cris/libc/check_ftag.c similarity index 100% rename from tests/tcg/cris/check_ftag.c rename to tests/tcg/cris/libc/check_ftag.c diff --git a/tests/tcg/cris/check_gcctorture_pr28634-1.c b/tests/tcg/cris/libc/check_gcctorture_pr28634-1.c similarity index 100% rename from tests/tcg/cris/check_gcctorture_pr28634-1.c rename to tests/tcg/cris/libc/check_gcctorture_pr28634-1.c diff --git a/tests/tcg/cris/check_gcctorture_pr28634.c b/tests/tcg/cris/libc/check_gcctorture_pr28634.c similarity index 100% rename from tests/tcg/cris/check_gcctorture_pr28634.c rename to tests/tcg/cris/libc/check_gcctorture_pr28634.c diff --git a/tests/tcg/cris/check_glibc_kernelversion.c b/tests/tcg/cris/libc/check_glibc_kernelversion.c similarity index 100% rename from tests/tcg/cris/check_glibc_kernelversion.c rename to tests/tcg/cris/libc/check_glibc_kernelversion.c diff --git a/tests/tcg/cris/check_hello.c b/tests/tcg/cris/libc/check_hello.c similarity index 100% rename from tests/tcg/cris/check_hello.c rename to tests/tcg/cris/libc/check_hello.c diff --git a/tests/tcg/cris/check_int64.c b/tests/tcg/cris/libc/check_int64.c similarity index 100% rename from tests/tcg/cris/check_int64.c rename to tests/tcg/cris/libc/check_int64.c diff --git a/tests/tcg/cris/check_lz.c b/tests/tcg/cris/libc/check_lz.c similarity index 100% rename from tests/tcg/cris/check_lz.c rename to tests/tcg/cris/libc/check_lz.c diff --git a/tests/tcg/cris/check_mapbrk.c b/tests/tcg/cris/libc/check_mapbrk.c similarity index 100% rename from tests/tcg/cris/check_mapbrk.c rename to tests/tcg/cris/libc/check_mapbrk.c diff --git a/tests/tcg/cris/check_mmap1.c b/tests/tcg/cris/libc/check_mmap1.c similarity index 100% rename from tests/tcg/cris/check_mmap1.c rename to tests/tcg/cris/libc/check_mmap1.c diff --git a/tests/tcg/cris/check_mmap2.c b/tests/tcg/cris/libc/check_mmap2.c similarity index 100% rename from tests/tcg/cris/check_mmap2.c rename to tests/tcg/cris/libc/check_mmap2.c diff --git a/tests/tcg/cris/check_mmap3.c b/tests/tcg/cris/libc/check_mmap3.c similarity index 100% rename from tests/tcg/cris/check_mmap3.c rename to tests/tcg/cris/libc/check_mmap3.c diff --git a/tests/tcg/cris/check_moveq.c b/tests/tcg/cris/libc/check_moveq.c similarity index 100% rename from tests/tcg/cris/check_moveq.c rename to tests/tcg/cris/libc/check_moveq.c diff --git a/tests/tcg/cris/check_openpf1.c b/tests/tcg/cris/libc/check_openpf1.c similarity index 100% rename from tests/tcg/cris/check_openpf1.c rename to tests/tcg/cris/libc/check_openpf1.c diff --git a/tests/tcg/cris/check_openpf2.c b/tests/tcg/cris/libc/check_openpf2.c similarity index 100% rename from tests/tcg/cris/check_openpf2.c rename to tests/tcg/cris/libc/check_openpf2.c diff --git a/tests/tcg/cris/check_openpf3.c b/tests/tcg/cris/libc/check_openpf3.c similarity index 100% rename from tests/tcg/cris/check_openpf3.c rename to tests/tcg/cris/libc/check_openpf3.c diff --git a/tests/tcg/cris/check_openpf5.c b/tests/tcg/cris/libc/check_openpf5.c similarity index 100% rename from tests/tcg/cris/check_openpf5.c rename to tests/tcg/cris/libc/check_openpf5.c diff --git a/tests/tcg/cris/check_settls1.c b/tests/tcg/cris/libc/check_settls1.c similarity index 100% rename from tests/tcg/cris/check_settls1.c rename to tests/tcg/cris/libc/check_settls1.c diff --git a/tests/tcg/cris/check_sigalrm.c b/tests/tcg/cris/libc/check_sigalrm.c similarity index 100% rename from tests/tcg/cris/check_sigalrm.c rename to tests/tcg/cris/libc/check_sigalrm.c diff --git a/tests/tcg/cris/check_stat1.c b/tests/tcg/cris/libc/check_stat1.c similarity index 100% rename from tests/tcg/cris/check_stat1.c rename to tests/tcg/cris/libc/check_stat1.c diff --git a/tests/tcg/cris/check_stat2.c b/tests/tcg/cris/libc/check_stat2.c similarity index 100% rename from tests/tcg/cris/check_stat2.c rename to tests/tcg/cris/libc/check_stat2.c diff --git a/tests/tcg/cris/check_stat3.c b/tests/tcg/cris/libc/check_stat3.c similarity index 100% rename from tests/tcg/cris/check_stat3.c rename to tests/tcg/cris/libc/check_stat3.c diff --git a/tests/tcg/cris/check_stat4.c b/tests/tcg/cris/libc/check_stat4.c similarity index 100% rename from tests/tcg/cris/check_stat4.c rename to tests/tcg/cris/libc/check_stat4.c diff --git a/tests/tcg/cris/check_swap.c b/tests/tcg/cris/libc/check_swap.c similarity index 100% rename from tests/tcg/cris/check_swap.c rename to tests/tcg/cris/libc/check_swap.c diff --git a/tests/tcg/cris/check_time2.c b/tests/tcg/cris/libc/check_time2.c similarity index 100% rename from tests/tcg/cris/check_time2.c rename to tests/tcg/cris/libc/check_time2.c diff --git a/tests/tcg/cris/crisutils.h b/tests/tcg/cris/libc/crisutils.h similarity index 100% rename from tests/tcg/cris/crisutils.h rename to tests/tcg/cris/libc/crisutils.h diff --git a/tests/tcg/cris/sys.h b/tests/tcg/cris/libc/sys.h similarity index 100% rename from tests/tcg/cris/sys.h rename to tests/tcg/cris/libc/sys.h From patchwork Tue Mar 12 17:09:23 2019 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: 160136 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13354599jad; Tue, 12 Mar 2019 10:18:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6ya/WqqOyndpcOKCTQLncLuMGTJmSq2ccRrApfZezAlQYSR3Op4J9ibQlHaL98ehFne+M X-Received: by 2002:a25:484:: with SMTP id 126mr31334807ybe.409.1552411128096; Tue, 12 Mar 2019 10:18:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411128; cv=none; d=google.com; s=arc-20160816; b=oi0y46rsbO8kIg+4VpsDcZsfMlyqa8PBdUfYs6L3VP3vM9XNkEnSywYBvQJqHq5HDz o19hbd4nV+cp+y4zuTBpTRj17ueknRTbahAiCTH4ZXoYgQmiR4Bf3ZQquzYnbshzM9VG 0DVaNATUeK1MPrJk79g5ssKmiFpMr3tAql2jNnItnBuRwaNJXeJJXPVixovjXWMTgG0S taMacQs/rBFOkjMdMOfcT9efUSZcHsSHLH57sqo29MeRTLUlg5Hs0iEa2BD0jqGEcTp4 RKl74LfDf6+yAyk+dJvaHOzqKBp+U7uinmh7OsrAQpMmdTNkbIGeMKWUFvCap8Joe6Ab bBoA== 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; bh=XmtfSlXDPQdYtG35y9g2Pj3Yb9yEc8oWzrEloEkGeQE=; b=hhByaU4we0PVmSM8hxdDuZKLJW+B3PsJo9j5pn/OQ6Qo+fr1h6oUDTGJ/vq9tOqqeO 7JRbS/VgE9nIJOmmtyrA/XZP7l9bBTqjy8DOnPFsAS1LXghdHNIlJS+8TQazGpw3WeHN 5bskDivi9B4Q9MqFehBo/ECVCdoWgnfrv3xLdkql8VjAioiVxj6mTcf9Sua/Wg8YTp8C eZYiI5T+IEloDyZpUWg2RaYwAFIxNmpzf0FZENGE4IyVLHETagcVmcwu3KnFliOrKBDf ZCBVzPBf6E+t3zTMpwQSautXyMDtQyVW0lMMo0UZ6u2iBZzN6X0bD7NQ9sQ9Ae9RL1u9 YHQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pa2rBooD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id 185si5310259ybd.160.2019.03.12.10.18.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:18:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pa2rBooD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l38-0005fx-UM for patch@linaro.org; Tue, 12 Mar 2019 13:18:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2h-0005OA-Ro for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzn-0003v1-Db for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:21 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35979) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzn-0003r0-2d for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:19 -0400 Received: by mail-wm1-x32f.google.com with SMTP id e16so3373237wme.1 for ; Tue, 12 Mar 2019 10:15:15 -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=XmtfSlXDPQdYtG35y9g2Pj3Yb9yEc8oWzrEloEkGeQE=; b=Pa2rBooD2gncF18ggGRmN0RN9IiDFr3qaEohm7h+0B1Pt1lDO+qkF4pRquiGzCf8+i S4NdiSc3MnIGsYNXg0GZn1TbbqHK+IKuO8+ejd8qOeYb1CeRlTT9yLOlUs+0Je8rccAt JtJpCE//+a8T6/JAsXZCphPlekecWmbEY7QbBVXMOxjPunzjhV8pN0u5h4pyQRjxwqIW /g57xnhZ1++4PlWpAiyf1+B1Pb8iAm/HwKYUmp3qYiyBm/pOCeWB0Mw8E+6LYY4qjNIc gh/EJcE6Xao7ZCUZSLVxLov9fsnKZosZcZOkTENrEXOd3I5wqrr/eaa5ChSFTdN0rrJM xDaA== 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=XmtfSlXDPQdYtG35y9g2Pj3Yb9yEc8oWzrEloEkGeQE=; b=E+CGOnx9iOvQM2UmIuZQmBtKSpLxwGmaLEDuuib8wwIZaTfgUegqt0r4Y9iqYO3Rpu bxHXyKhiGREal6ztNTITTeGEPAqqVEteT4CNUSgbLsb8Yoc5kNTVfrIssDwEIZmLKW+w R52h2saqCYfpfkZgr3/IUppb/p3BbMR4gMIMyOheXtNZH4RgKyaVS3B6jbCSnw1kDBQR 4ulLQWDEMAXrVH+aVekbXhsMb8DtHMalboq2q5UfKT8piN0Tq/vKwWj7P3f0LSukOoe9 4sjnARJULBRYoS1k3Jpx/TOgo3hGoDo7aSSarNf9m3Mph3hqR017P2Bm7Nx9BZBfVRHM ewIw== X-Gm-Message-State: APjAAAWPlH1I6e/2Jqj7mkoy+srRA1Sm5e7zcDvuai4zYEG3En1tsqIT cC/5v+/c3KVuWhJazFwq5OcqOg== X-Received: by 2002:a1c:d18a:: with SMTP id i132mr3178462wmg.27.1552410914503; Tue, 12 Mar 2019 10:15:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u12sm10590731wrt.2.2019.03.12.10.15.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 463521FF9F; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:23 +0000 Message-Id: <20190312170931.25013-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32f Subject: [Qemu-devel] [PULL 18/26] tests/tcg/cris: comment out the ccs test 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" Evidently upstream gcc doesn't like this opcode. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/cris/bare/check_btst.s b/tests/tcg/cris/bare/check_btst.s index e39fc8f4d6..485deb2006 100644 --- a/tests/tcg/cris/bare/check_btst.s +++ b/tests/tcg/cris/bare/check_btst.s @@ -85,12 +85,12 @@ checkr3 1111 ; check that X gets cleared and that only the NZ flags are touched. - move.d 0xff, $r0 - move $r0, $ccs - btst r3,r3 - move $ccs, $r0 - and.d 0xff, $r0 - cmp.d 0xe3, $r0 - test_cc 0 1 0 0 + ;; move.d 0xff, $r0 + ;; move $r0, $ccs + ;; btst r3,r3 + ;; move $ccs, $r0 + ;; and.d 0xff, $r0 + ;; cmp.d 0xe3, $r0 + ;; test_cc 0 1 0 0 quit From patchwork Tue Mar 12 17:09:24 2019 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: 160140 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13203325oce; Tue, 12 Mar 2019 10:23:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyeSsxNjXxfnGq3QjUg5/s+6jhilhNHyN9pbmCAtwP2OooGTXiaJ0veMzEV7Jenlnflk+8S X-Received: by 2002:a0d:d407:: with SMTP id w7mr7090022ywd.50.1552411414156; Tue, 12 Mar 2019 10:23:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411414; cv=none; d=google.com; s=arc-20160816; b=lTst753VExHQZudP6drbSvbkxLja4uWU2Bt5yqx4wlNojmkxMgKkEtESbbCWvHSGc+ CS9ENyAnzprFuVVcyhi03ZvPrNSCp4RxD6gySL0Ck5AIfFXB/Jx8elZ8vDwQTGs5DkQ3 h4eVwXf3Lj/38v2aXfWkn/tIuSyhp5zcOpiM7EvRLd2MEAyJBvtCIm39HhGBMEittNEJ fk9gY/D0HgNG0nSAEOegPhm/0dBq8OsC4WzHjNdCvMJAMmlpbFzj1TgxzXDNZoBuHdcS xHSTmOfuZJsFDuaIjtctG+ytSfJuExpp/89m7zmMunMhpzQC822oST4dSkwzDTnFy7Wg wdaQ== 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; bh=oHvngL4BW+hZ3k1JJ2kDtZ3yTQU9qdfko1eiJB8+9Sk=; b=zjERzkBWSRUFQwbH4hGywL9DbgU8Xub1StXTp9o5+wjt/d8N3xDidKwMRxSW88j4JR Zdyg8hqc4F7TDok7qfesrXUh6BoWIWAngUUAu8GY2EeRo4LLCSkGOF2E3fSzod0Kp+1e fcCP9j0c2rZ6HJDK9MyJor46NqhPgVkmBF22HxifTTMQ1/WLbe2f2k7AH2uFtuTalM7Q b7n4OMjNK6uqon3mx8z3SYcfwrHibnVUC/jPP8AfteFMxCODcsp6n7K442PQoI1+019U lVRz5L9v/ICEQbjVvN9mnDRA32toWcKWNypX0o7lqY4cMcgt1MTwqwudWChqwJE4YKv1 xrIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V0iWPofo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id s125si5253020yws.102.2019.03.12.10.23.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:23:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V0iWPofo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l7l-0001GO-L1 for patch@linaro.org; Tue, 12 Mar 2019 13:23:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2i-0005UY-WE for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003ty-Qp for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:20 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:34115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003pH-Ea for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x32d.google.com with SMTP id o10so2618870wmc.1 for ; Tue, 12 Mar 2019 10:15:12 -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=oHvngL4BW+hZ3k1JJ2kDtZ3yTQU9qdfko1eiJB8+9Sk=; b=V0iWPofoR+ShMcs14sB/Z4aHyXMwMX3oso5ScawA4pVMRwyFu1U39VARQ3eCJl1KRI 39cv5PKDHC3Vbpg11SfkC6kIKjhQkXzdOvscWHKODRk1AXan9PCGzoaAJYHRsfs1mn5l 327i4haY7TsG2/x3tnbMD2VNr2XAZR87NEscMAvs9TKLnMf6pcBnDYwL95x3uGCa5vjl VQ1CeqedvV01ZDlJUc38I+wf5BJU6ZhsqgNEHuV40Rgf4GzAoJq8cYJngnBiLdxHMgs+ pq3DYxglYggLJBlimMYqRB6F2rKRT4GTSLtMvBliEDKAvnHnoEWXtat0A3/95zPYJhEw dVWQ== 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=oHvngL4BW+hZ3k1JJ2kDtZ3yTQU9qdfko1eiJB8+9Sk=; b=W+8kFXZ+uGGmPrdEHkpF+BGy1FxQBHvqsplILcVpmDjtagleBvOkir4KBci4YYvVMa mbl3/YIOcXAeCyWS9VmubZyUhSiwT34BxgQvUIX+PtvPCPDTFEe50o29l2z4OqDnNM7M wqKgHJzJrEfR2o1faJAZ2+Pe5YNcUZt1vFD4B5mxBgsMVZkbSb4+ImyaIOF9FuR6ln7B KVWBWOKwMn5aPcslNR8VIFE0wn+rncr+sHwI3JKo3voY3OE2iR5NVNa8X/UFDu0TQwzd KHbSWCOwuVHCb4HT86dlxCmLBoYrSjW0I0uXtr/wY6vO+eJPsvUjUuGoifPEFYEETP7x ylfw== X-Gm-Message-State: APjAAAUOQ3h5Scm/8tFkSZf8zpZVOWLRygtJdT4CZO33Rzhso80DvEUB L0sZJC0j36MN/lmwJ/R4lPj+NLvYRW8= X-Received: by 2002:a1c:ed0b:: with SMTP id l11mr3350954wmh.38.1552410911709; Tue, 12 Mar 2019 10:15:11 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p9sm4808483wmc.14.2019.03.12.10.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51D8D1FFA3; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:24 +0000 Message-Id: <20190312170931.25013-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::32d Subject: [Qemu-devel] [PULL 19/26] tests/tcg/cris: align mul operations 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" To avoid: Error: dangerous MULS/MULU location; give it higher alignment Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/cris/bare/check_mulx.s b/tests/tcg/cris/bare/check_mulx.s index d43241a6f5..a7a1f82a82 100644 --- a/tests/tcg/cris/bare/check_mulx.s +++ b/tests/tcg/cris/bare/check_mulx.s @@ -3,6 +3,8 @@ .include "testutils.inc" start + + .align 4 moveq -1,r3 moveq 2,r4 muls.d r4,r3 @@ -11,6 +13,7 @@ move mof,r3 checkr3 ffffffff + .align 4 moveq -1,r3 moveq 2,r4 mulu.d r4,r3 @@ -19,6 +22,7 @@ move mof,r3 checkr3 1 + .align 4 moveq 2,r3 moveq -1,r4 muls.d r4,r3 @@ -27,6 +31,7 @@ move mof,r3 checkr3 ffffffff + .align 4 moveq 2,r3 moveq -1,r4 mulu.d r4,r3 @@ -98,6 +103,7 @@ checkr3 1fffe move mof,r3 checkr3 0 + nop moveq 2,r3 move.d 0xffff,r4 @@ -138,6 +144,7 @@ checkr3 fdbdade2 move mof,r3 checkr3 ffffffff + nop move.d 0x5432f789,r4 move.d 0x78134452,r3 @@ -146,6 +153,7 @@ checkr3 420fade2 move mof,r3 checkr3 0 + nop move.d 0xff,r3 moveq 2,r4 @@ -186,6 +194,7 @@ checkr3 1 move mof,r3 checkr3 0 + nop moveq -1,r4 move.d r4,r3 @@ -194,6 +203,7 @@ checkr3 fe01 move mof,r3 checkr3 0 + nop move.d 0xfeda49ff,r4 move.d r4,r3 @@ -202,6 +212,7 @@ checkr3 1 move mof,r3 checkr3 0 + nop move.d 0xfeda49ff,r4 move.d r4,r3 From patchwork Tue Mar 12 17:09:25 2019 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: 160148 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13363740jad; Tue, 12 Mar 2019 10:27:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvjHqtuPurNBM0ceKEt8sRTf5Xk6WgsdCbuesrPBkiLWDE2380MVObtd8Fxh4g8OFPpcCt X-Received: by 2002:a81:3d17:: with SMTP id k23mr30894581ywa.266.1552411619904; Tue, 12 Mar 2019 10:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411619; cv=none; d=google.com; s=arc-20160816; b=VaiV/7TL+pxBXjK2aGLsdwhQ3039vBDJ8FORk6Ae6iBc4rbKtTAWHaCymcdUMBwVUx ZVl8DsgWgY5dQZ6H2FGEVf4QQ1G9u681mUIZBwosyQKNF3htwecugdNdAggx6jPOIZPW dRXakWgoMEqKymEVuGN2pEnS/ezbdSyHmz+eHqiFUEB+mjB3SRyE3LpQNnzW/wRzd4IB 8XO3mejOOqxfJPFLnElr3O1WsG/1eg1WJtwhqnPbuetw7EXgnwZwAGZPGwZ8BJWKXx/H Ujxf/620oLKC8CfAXSLBYD/m5IpEAmFzlrxI731wy/76v4ImI8C+9AbVYIGhlakcdj1h seNQ== 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; bh=TFgvWlZV7wudN7pQg0ACCe0vgpMyhTrD5jIa/sEuDDw=; b=b/qtSEmrXuDoJfA9HcSIq+9Mj6DFkNe+BGaxGXwaudeWsklstIHllu/Yo7nI6eY1JZ 038k9vYYYr+q6RqmG+bY5gRtEDIp2wpSyivQA+9t2fkXBA3Zy8WP8CL2Yce9byZY5UvA VTm+U/iM4Hnlwfbe8tf1G6BBdFcco8dBWpLJh8dDXv0STpK3kJ51XUDw07CEApBWgeW1 tqDWHYklII1+LCmEkcdDYW5IF01c0jZYLt6P8JX+x5L1aXElGh4U9nc8lHvd2R17Yr3D DK0B9deuFt0AwlhMO0BRgF/TygoArVL5xJrKjm02IZha+LNMnd3UM0wBW2P1P5yiAjNk QIXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zfc1EiAv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id i196si5589465ywc.3.2019.03.12.10.26.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:26:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zfc1EiAv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lB5-0005Of-Bz for patch@linaro.org; Tue, 12 Mar 2019 13:26:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2h-0005Wi-Oh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003tY-ON for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:21 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003ok-Ar for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x342.google.com with SMTP id a188so3440887wmf.3 for ; Tue, 12 Mar 2019 10:15:12 -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=TFgvWlZV7wudN7pQg0ACCe0vgpMyhTrD5jIa/sEuDDw=; b=zfc1EiAv96w3fhVsGN2evI1VMUhpmSusdzHp+4JfYpLeBOS1abrlMgzayve/qdyq1d XJVdNV2jFBZEO2h3qgqpj1GnPRUikUueF6MANHprFeO7Q33bYr/v9k4gChVR6xsXSdmP tFF1NnNRRULvDGrKBpdFteWsoh+hnu+OSE/6gLGG6Sj7Eokgg0GSoRQ8gla9SoBoRTFj 2HPjke4c8EZVRDDuTZJWYamhXWiEULlAPN405PCJBLslsUtCrIuaXvPJd78OwI1Ir5js vjlpYY6/koqv4ddY1NphbBMGgfohYdERs2qS+7OIUjA43lBD3jVGJEyBl8MSt1HAF16S v+ZQ== 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=TFgvWlZV7wudN7pQg0ACCe0vgpMyhTrD5jIa/sEuDDw=; b=anPsdAdt4D9Z1RyFmY/nBDPxmVJvxBJ9uksDIsDwLbDc68EsDCJ7PAqKkCIDEcEUAd Y+JWfP6ZebkwyQQ12llSH/Vfl1/fhFCM9/tUgUcibSu8Af+hei1qhejMiCYZkhkkUuH/ imRI+pMKHySLBwka9o/pqy+3DOmFrgHYM+8FukS6HNceHhKmCinykPhObsmGEt5nyU+8 MVMeSlXvOx1Mai13/N795j53eL1n8ibUIjtcuKQpiYZekknzKlMTfWZsYQRW2AIWFO6D wbP6hXqarfxi4TEhPLSA36ktL/64cMJBrXvaYJxC5FOZrkuLnyaGwXsEOWoJK2DxHry1 7S2Q== X-Gm-Message-State: APjAAAW5HfwAeUW/l+DTL8aZtd6g7OJnWa2TrgSapGCYt289s1oetwGt IQ00uHPNhidbCSOoniWcJz+ZWg== X-Received: by 2002:a1c:4406:: with SMTP id r6mr3148838wma.114.1552410910916; Tue, 12 Mar 2019 10:15:10 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g3sm2785015wmk.32.2019.03.12.10.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5DB341FFA5; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:25 +0000 Message-Id: <20190312170931.25013-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::342 Subject: [Qemu-devel] [PULL 20/26] tests/tcg: enable cris base user-mode tests 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" This converts the existing Makefile into a Makefile.target and updates it so it can be called by the tcg build system. The original Makefile didn't set -cpu except for the v17 tests however that has broken (I assume because linux-user is a "max" cpu) so here I force it to be crisv17. I've also replicated the GNU simulator targets (run-FOO-on-sim). Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 83d43c50e4..60314d293a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -116,6 +116,7 @@ docker-image-tricore-cross: docker-image-debian9 DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross +DOCKER_PARTIAL_IMAGES += fedora-cris-cross # Rules for building linux-user powered images # diff --git a/tests/tcg/cris/Makefile b/tests/tcg/cris/Makefile deleted file mode 100644 index 664b30ce81..0000000000 --- a/tests/tcg/cris/Makefile +++ /dev/null @@ -1,168 +0,0 @@ --include ../../../config-host.mak - -CROSS=crisv32-axis-linux-gnu- -SIM=../../../cris-linux-user/qemu-cris -L ./ -SIMG=cris-axis-linux-gnu-run --sysroot=./ - -CC = $(CROSS)gcc -#AS = $(CROSS)as -AS = $(CC) -x assembler-with-cpp -SIZE = $(CROSS)size -LD = $(CC) -OBJCOPY = $(CROSS)objcopy - -# we rely on GCC inline:ing the stuff we tell it to in many places here. -CFLAGS = -Winline -Wall -g -O2 -static -NOSTDFLAGS = -nostartfiles -nostdlib -ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/tcg/cris/ -LDLIBS = -NOSTDLIBS = -lgcc - -CRT = crt.o -SYS = sys.o -TESTCASES += check_abs.tst -TESTCASES += check_addc.tst -TESTCASES += check_addcm.tst -TESTCASES += check_addcv17.tst -TESTCASES += check_addo.tst -TESTCASES += check_addoq.tst -TESTCASES += check_addi.tst -TESTCASES += check_addiv32.tst -TESTCASES += check_addm.tst -TESTCASES += check_addr.tst -TESTCASES += check_addq.tst -TESTCASES += check_addxc.tst -TESTCASES += check_addxm.tst -TESTCASES += check_addxr.tst -TESTCASES += check_andc.tst -TESTCASES += check_andm.tst -TESTCASES += check_andr.tst -TESTCASES += check_andq.tst -TESTCASES += check_asr.tst -TESTCASES += check_ba.tst -TESTCASES += check_bas.tst -TESTCASES += check_bcc.tst -TESTCASES += check_bound.tst -TESTCASES += check_boundc.tst -TESTCASES += check_boundr.tst -TESTCASES += check_btst.tst -TESTCASES += check_clearfv32.tst -TESTCASES += check_cmpc.tst -TESTCASES += check_cmpr.tst -TESTCASES += check_cmpq.tst -TESTCASES += check_cmpm.tst -TESTCASES += check_cmpxc.tst -TESTCASES += check_cmpxm.tst -TESTCASES += check_cmp-2.tst -TESTCASES += check_clrjmp1.tst -TESTCASES += check_dstep.tst -TESTCASES += check_ftag.tst -TESTCASES += check_int64.tst -# check_jsr is broken. -#TESTCASES += check_jsr.tst -TESTCASES += check_mcp.tst -TESTCASES += check_movei.tst -TESTCASES += check_mover.tst -TESTCASES += check_moverm.tst -TESTCASES += check_moveq.tst -TESTCASES += check_movemr.tst -TESTCASES += check_movemrv32.tst -TESTCASES += check_movecr.tst -TESTCASES += check_movmp.tst -TESTCASES += check_movpr.tst -TESTCASES += check_movprv32.tst -TESTCASES += check_movdelsr1.tst -TESTCASES += check_movpmv32.tst -TESTCASES += check_movsr.tst -TESTCASES += check_movsm.tst -TESTCASES += check_movscr.tst -TESTCASES += check_movur.tst -TESTCASES += check_movum.tst -TESTCASES += check_movucr.tst -TESTCASES += check_mulx.tst -TESTCASES += check_mulv32.tst -TESTCASES += check_neg.tst -TESTCASES += check_not.tst -TESTCASES += check_lz.tst -TESTCASES += check_lapc.tst -TESTCASES += check_lsl.tst -TESTCASES += check_lsr.tst -TESTCASES += check_orc.tst -TESTCASES += check_orm.tst -TESTCASES += check_orr.tst -TESTCASES += check_orq.tst -TESTCASES += check_ret.tst -TESTCASES += check_swap.tst -TESTCASES += check_scc.tst -TESTCASES += check_subc.tst -TESTCASES += check_subq.tst -TESTCASES += check_subr.tst -TESTCASES += check_subm.tst -TESTCASES += check_glibc_kernelversion.tst -TESTCASES += check_xarith.tst - -TESTCASES += check_hello.ctst -TESTCASES += check_stat1.ctst -TESTCASES += check_stat2.ctst -TESTCASES += check_stat3.ctst -TESTCASES += check_stat4.ctst -TESTCASES += check_openpf1.ctst -TESTCASES += check_openpf2.ctst -TESTCASES += check_openpf3.ctst -TESTCASES += check_openpf5.ctst -TESTCASES += check_mapbrk.ctst -TESTCASES += check_mmap1.ctst -TESTCASES += check_mmap2.ctst -TESTCASES += check_mmap3.ctst -TESTCASES += check_sigalrm.ctst -TESTCASES += check_time2.ctst -TESTCASES += check_settls1.ctst - -TESTCASES += check_gcctorture_pr28634-1.ctst -#TESTCASES += check_gcctorture_pr28634.ctst - -all: build - -%.o: $(SRC_PATH)/tests/tcg/cris/%.c - $(CC) $(CFLAGS) -c $< -o $@ - -%.o: $(SRC_PATH)/tests/tcg/cris/%.s - $(AS) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o - $(CC) $(CFLAGS) $(NOSTDFLAGS) $(LDLIBS) $(NOSTDLIBS) $(CRT) $< $(SYS) -o $@ - -%.ctst: %.o - $(CC) $(CFLAGS) $(LDLIBS) $< -o $@ - - -sysv10.o: sys.c - $(CC) $(CFLAGS) -mcpu=v10 -c $< -o $@ - -crtv10.o: crt.s - $(AS) $(ASFLAGS) -mcpu=v10 -c $< -o $@ - -check_addcv17.tst: ASFLAGS += -mcpu=v10 -check_addcv17.tst: CRT := crtv10.o -check_addcv17.tst: SYS := sysv10.o -check_addcv17.tst: crtv10.o sysv10.o - -build: $(CRT) $(SYS) $(TESTCASES) - -check: $(CRT) $(SYS) $(TESTCASES) - @printf "\nQEMU simulator.\n" - for case in $(TESTCASES); do \ - printf %s "$$case "; \ - SIMARGS=; \ - case $$case in *v17*) SIMARGS="-cpu crisv17";; esac; \ - $(SIM) $$SIMARGS ./$$case; \ - done -check-g: $(CRT) $(SYS) $(TESTCASES) - @printf "\nGDB simulator.\n" - @for case in $(TESTCASES); do \ - printf %s "$$case "; \ - $(SIMG) $$case; \ - done - -clean: - $(RM) -fr $(TESTCASES) *.o diff --git a/tests/tcg/cris/Makefile.include b/tests/tcg/cris/Makefile.include new file mode 100644 index 0000000000..1c037824bf --- /dev/null +++ b/tests/tcg/cris/Makefile.include @@ -0,0 +1,6 @@ +# +# Makefile.include for all CRIS targets +# + +DOCKER_IMAGE=fedora-cris-cross +DOCKER_CROSS_COMPILER=cris-linux-gnu-gcc diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target new file mode 100644 index 0000000000..c1173ead42 --- /dev/null +++ b/tests/tcg/cris/Makefile.target @@ -0,0 +1,58 @@ +# -*- Mode: makefile -*- +# +# Cris tests +# +# Currently we can only build the "bare" tests with the docker +# supplied cross-compiler. +# + +CRIS_SRC = $(SRC_PATH)/tests/tcg/cris/bare +CRIS_ALL = $(wildcard $(CRIS_SRC)/*.s) +CRIS_TESTS = $(patsubst $(CRIS_SRC)/%.s, %, $(CRIS_ALL)) +# Filter out common blobs and broken tests +CRIS_BROKEN_TESTS = crt check_jsr +# upstream GCC doesn't support v32 +CRIS_BROKEN_TESTS += check_mcp check_mulv32 check_addiv32 check_movpmv32 +CRIS_BROKEN_TESTS += check_movprv32 check_clearfv32 check_movemrv32 check_bas +CRIS_BROKEN_TESTS += check_lapc check_movei +# no sure why +CRIS_BROKEN_TESTS += check_scc check_xarith + +CRIS_USABLE_TESTS = $(filter-out $(CRIS_BROKEN_TESTS), $(CRIS_TESTS)) +CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS)) + +# override the list of tests, as we can't build the multiarch tests +TESTS = $(CRIS_USABLE_TESTS) +VPATH = $(CRIS_SRC) + +AS = $(CC) -x assembler-with-cpp +LD = $(CC) + +# we rely on GCC inline:ing the stuff we tell it to in many places here. +CFLAGS = -Winline -Wall -g -O2 -static +NOSTDFLAGS = -nostartfiles -nostdlib +ASFLAGS += -mcpu=v10 -g -Wa,-I,$(SRC_PATH)/tests/tcg/cris/bare +CRT_FILES = crt.o sys.o + +# stop make deleting crt files if build fails +.PRECIOUS: $(CRT_FILES) + +%.o: %.c + $(CC) -c $< -o $@ + +%.o: %.s + $(AS) $(ASFLAGS) -c $< -o $@ + +%: %.s $(CRT_FILES) + $(CC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT_FILES) + +# The default CPU breaks (possibly as it's max?) so force crisv17 +$(CRIS_RUNS): QEMU_OPTS=-cpu crisv17 + +# Additional runners to run under GNU SIM +CRIS_RUNS_ON_SIM=$(patsubst %, %-on-sim, $(CRIS_RUNS)) +SIMG:=cris-axis-linux-gnu-run + +# e.g.: make -f ../../tests/tcg/Makefile run-check_orm-on-sim +run-%-on-sim: + $(call run-test, $<, $(SIMG) $<, "$< on $(TARGET_NAME) with SIM") From patchwork Tue Mar 12 17:09:26 2019 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: 160143 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13203833oce; Tue, 12 Mar 2019 10:24:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqypXam+PfzBnmjvmo9Gvx8ebg1ygZtmV855gmYpMLJJiDEnGUHyFKOvtqbSN6ymm+Ad++HC X-Received: by 2002:a25:f201:: with SMTP id i1mr6320281ybe.155.1552411442257; Tue, 12 Mar 2019 10:24:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411442; cv=none; d=google.com; s=arc-20160816; b=m7dsc4a9Ucn/BChO0ZVzLIXTwAa1hBRnU39xS+REbU6YPDpNLBBhVXDeRhLZDZ+bRu k6EbcZ1mYVsXG5rjzqOXaHvH7wy0hc3EL9PefH/RdCTyonFk7uRqm2O89BwHwF82i23j K7Xmx7EuOLFY3HmgRUKent0ddOmuY9pzG3Wp26eNVFXfYXB54XViWsZ/NZJS1G4hVeRO Wj82b2ZTMqCpNbmpw/LViNcTnAoovb9upNWMKJtWkEf1zmdzZFcd5Azse9HEXPTWYRBw CGhyzy3GT+6ZXghkGAoJ+y1Kj2RylM63hQow2JzzXueUEQDBuOQl3rlNSOd4qVsTtAj+ FyEQ== 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; bh=3whuNUzyAJ/yqQTSF6kfELry8GUDCbdrK/J4r3ICj6o=; b=Zhs0fLLSj7/Hh25HNGqrAycp3shNxiCdfbki5Ed7u3E/FVQyqa19NuXvqYCvgJK81g isX+v8MVWY0iwGG7goX/aNXN+d9N+vet933rDD4q5ek57q+KmMJYkS4XjcNY378QOZq3 h//ZLarsltrEP1RiHNPWjVPcHeVabSxieIu8B7pf8bcDli41opOIyFrIbZzoSd1MeOQE DY20YR6Hmciq63UU3z9zu9aKta8KMaEt7U/3zTCxqJIN2VsNejxXebFb2pZrqjpBLe5P Zqq9Xqt5wLo34cHadijgsXrCv4yT3HfWEJVpyBZ0JskjMPM18MbmpRd2xMaxGfaXgPsM bJ6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TMvQtfcB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id l10si5180299ybb.419.2019.03.12.10.24.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:24:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TMvQtfcB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l8D-0001eP-Ls for patch@linaro.org; Tue, 12 Mar 2019 13:24:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2i-0005OA-J4 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzn-0003uY-28 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:21 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:43645) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003pc-Of for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wr1-x436.google.com with SMTP id d17so3553369wre.10 for ; Tue, 12 Mar 2019 10:15: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=3whuNUzyAJ/yqQTSF6kfELry8GUDCbdrK/J4r3ICj6o=; b=TMvQtfcBAgkdN3qtoj4s72awFniDV1KA9T/jKzWas6FR0K28d75LVdMeT4yJGWG1lt u3cxOjEBpLIdEdLRZKCarhaPtHbOi+iWim3ZiTFq6/8WfwucJOvKZ9jVBwp+KbqYjqtI HvaF56P0/MgDrsUpfm1phflt6VIJGbdtBXl3Oazm1O953cgn8z+9j6D4wyxHrwYn12kD Oyu0z4sHwi3+P+NzRzu+ifXKGneVMkWA8r3wg31Q6TghA7Q9+6pfkZmiITlTBWdqFUHP 7oy/onMaLO382baWnhh5bxK3PAbrWArrHcglOqlwvQSFlce35a3ecXlshG7xfcgm8Xp/ UYug== 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=3whuNUzyAJ/yqQTSF6kfELry8GUDCbdrK/J4r3ICj6o=; b=Z3uAkm/JKaWAsjyutdWo0H2To0rbCdTr/2iBUS54D0ezoCP53hWeeuEdkvEK0J6zLV IIlCE5QKY5hc8ov/jlK91ZZIPn8sN9poPYPDuZ0F8ZaH9qyiLrms7KnC5BFindWTVU9i 3CgFCHjx/erxGXFdmblzsUkvzXnWcW0w8ZTq7lD0Cpl/5mvy666PdUu4RFrhuxeBY34g W/KWwcDWGejdqq2Fd8KCQNlGo+28iJm7SdxVODaC5tkbx3mkGvie+cMI/Sd9yWw+LRgt iP2geKZ7WMKagcwBwU4/hBpfAJGDeM0VBLzAaQbtw3udWomrq+1QF+xFPqcDfZMJ0kP+ glaw== X-Gm-Message-State: APjAAAXNMqzDNS12sXqD5KM9d2Qmced0LFg1a20oqac0OMCgLrp8nxe8 +9IcFX6jdzotS4q8pf5QnlaM6g== X-Received: by 2002:adf:ff81:: with SMTP id j1mr25119510wrr.261.1552410912302; Tue, 12 Mar 2019 10:15:12 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j71sm4584423wmj.44.2019.03.12.10.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 69D291FFA6; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:26 +0000 Message-Id: <20190312170931.25013-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::436 Subject: [Qemu-devel] [PULL 21/26] tests/tcg: provide a minilib for system tests 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: Kevin Wolf , Alexander Spyridakis , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will likely want a few common functions to make up for the fact we don't have a libc and we don't want to feel like we are programming by banging rocks together. I've purloined the printf function from: https://git.virtualopensystems.com/dev/tcg_baremetal_tests Although I have tweaked the names to avoid confusing GCC about clashing with builtins. Cc: Alexander Spyridakis Cc: Kevin Wolf Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 8dfd1a76b9..1cdd628e96 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -95,6 +95,7 @@ else # For softmmu targets we include a different Makefile fragement as the # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. +-include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile.target new file mode 100644 index 0000000000..3ed8077d0f --- /dev/null +++ b/tests/tcg/minilib/Makefile.target @@ -0,0 +1,21 @@ +# +# System test minilib objects +# +# The system tests are very constrained in terms of the library they +# support but we are not savages. We provide a few helpful routines +# that can be shared with the tests for basic I/O. +# +# They assume each arch has provided a putc function. +# + +SYSTEM_MINILIB_SRC=$(SRC_PATH)/tests/tcg/minilib +MINILIB_SRCS=$(wildcard $(SYSTEM_MINILIB_SRC)/*.c) +MINILIB_OBJS=$(patsubst $(SYSTEM_MINILIB_SRC)/%.c, %.o, $(MINILIB_SRCS)) + +MINILIB_CFLAGS+=-nostdlib -ggdb -O0 +MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC) + +.PRECIOUS: $(MINILIB_OBJS) + +%.o: $(SYSTEM_MINILIB_SRC)/%.c + $(CC) $(CFLAGS) -c $< -o $@ diff --git a/tests/tcg/minilib/minilib.h b/tests/tcg/minilib/minilib.h new file mode 100644 index 0000000000..e23361380a --- /dev/null +++ b/tests/tcg/minilib/minilib.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2015 Virtual Open Systems SAS + * Author: Alexander Spyridakis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * SPDX-License-Identifier: GPL-2.0-only + */ + +#ifndef _MINILIB_H_ +#define _MINILIB_H_ + +/* + * Provided by the individual arch + */ +extern void __sys_outc(char c); + +/* + * Provided by the common minilib + */ +void ml_printf(const char *fmt, ...); + +#endif /* _MINILIB_H_ */ diff --git a/tests/tcg/minilib/printf.c b/tests/tcg/minilib/printf.c new file mode 100644 index 0000000000..121620cb16 --- /dev/null +++ b/tests/tcg/minilib/printf.c @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2015 Virtual Open Systems SAS + * Author: Alexander Spyridakis + * + * printf based on implementation by Kevin Wolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * SPDX-License-Identifier: GPL-2.0-only + */ + +#include "minilib.h" + +typedef __builtin_va_list va_list; +#define va_start(ap, X) __builtin_va_start(ap, X) +#define va_arg(ap, type) __builtin_va_arg(ap, type) +#define va_end(ap) __builtin_va_end(ap) + +static void print_str(char *s) +{ + while (*s) { + __sys_outc(*s++); + } +} + +static void print_num(unsigned long long value, int base) +{ + char digits[] = "0123456789abcdef"; + char buf[32]; + int i = sizeof(buf) - 2, j; + + /* Set the buffer to 0. See problem of before. */ + for (j = 0; j < 32; j++) { + buf[j] = 0; + } + + do { + buf[i--] = digits[value % base]; + value /= base; + } while (value); + + print_str(&buf[i + 1]); +} + +void ml_printf(const char *fmt, ...) +{ + va_list ap; + char *str; + int base; + int has_long; + int alt_form; + unsigned long long val; + + va_start(ap, fmt); + + for (; *fmt; fmt++) { + if (*fmt != '%') { + __sys_outc(*fmt); + continue; + } + fmt++; + + if (*fmt == '#') { + fmt++; + alt_form = 1; + } else { + alt_form = 0; + } + + if (*fmt == 'l') { + fmt++; + if (*fmt == 'l') { + fmt++; + has_long = 2; + } else { + has_long = 1; + } + } else { + has_long = 0; + } + + switch (*fmt) { + case 'x': + case 'p': + base = 16; + goto convert_number; + case 'd': + case 'i': + case 'u': + base = 10; + goto convert_number; + case 'o': + base = 8; + goto convert_number; + + convert_number: + switch (has_long) { + case 0: + val = va_arg(ap, unsigned int); + break; + case 1: + val = va_arg(ap, unsigned long); + break; + case 2: + val = va_arg(ap, unsigned long long); + break; + } + + if (alt_form && base == 16) { + print_str("0x"); + } + + print_num(val, base); + break; + + case 's': + str = va_arg(ap, char*); + print_str(str); + break; + case '%': + __sys_outc(*fmt); + break; + default: + __sys_outc('%'); + __sys_outc(*fmt); + break; + } + } + + va_end(ap); +} From patchwork Tue Mar 12 17:09:27 2019 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: 160139 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13201050oce; Tue, 12 Mar 2019 10:21:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJQiD3bT21eUwU4kZ6jVVC3rQn5CTSb+CtU+jgq9t1P61HINJZzQJx5BBlYxOF03Z5eCMG X-Received: by 2002:a25:814c:: with SMTP id j12mr32774729ybm.363.1552411298309; Tue, 12 Mar 2019 10:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411298; cv=none; d=google.com; s=arc-20160816; b=Tqx29HcPlFFo1yYaTbDU0tiis+D5Wb85a94c+1100NSfCy4Xc4Cimvzugmp/1tbvNw FcCDQ3tzplhEVHG7Ea7ElTvdgiD6BANAe68kHJ3TvsnUQCBREfF/AlFxCI9A7GWlREOw Jy1x1tiU7x2h1nTDZLy0JWz9FY98or0TJgy/3WqqVu+aDb52xCMmgtQMxAN+7ZfzpHVP rzLVCVAMa8zmJtEP9eTWJz39ib6YZpm3bnqy0yLqnscCqdoaV055hrnYT8LTTX5airnx dseSbAqRkDyf544eEZT3ADw/El656CQRykn1BDTXdGh+bI/cAFidnG9q47o3uz2ZKcYw gRTA== 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; bh=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=InzFDjwEYX99SiwLPtLr6L6XnndmNXUuRS7iSuYocxdpPKfAk3nZ12UQysN/KoWOUE IJMgCFhj7aslQyQbPvORn1wnKkGl0I9IPEgigoaPs7MQLFOCUGMMiPP36vyQfuKZIIMc +c49646KgYKkBazCgVf/mtF+H1TItt0iyzy0KdY+CvyaCiDSeZEyyFavHF4dOPNmAhFn Sg7x28xabv9Z5bwqWs+hah4EN3GjAx6LMfPzB5xsPCIY4ynxmTkcbBeDe+L8rMPWfLuf fqneK5CRrsj4MNry9D2c5B7ZncXLkcqJTiIUsgj7ZWhte/SjQAFz7OY7jVu4HvyEOy1d WP1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=miqon2An; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id q80si5557069ybg.209.2019.03.12.10.21.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:21:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=miqon2An; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l5t-0000GZ-OL for patch@linaro.org; Tue, 12 Mar 2019 13:21:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2i-0005SB-VQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003tm-PP for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:20 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003sQ-Bm for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x336.google.com with SMTP id x10so3446879wmg.2 for ; Tue, 12 Mar 2019 10:15:17 -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=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=miqon2AnUKeHPq30JahMaoBlZz6AJyjgudVOOlDnkKt9VZOKHkf2v2ixZMKkkugKiQ JKj2WiLqyN5zKG+NDE0CmtgVdkEc0VPfPWH0PKlvku1jSpY2qVD+zVIbgFIk+y3WOEAm n5rpk/tY6gbAD5vF/Mq1BgYy055X4XPMCx8sHInIGVQbiYUBYkSWsbbM+3mnHmbANMG5 hEYZfwdk+1h/X6mQomiESbJDOBx+hnwuDcgduFA9i2oL4DoGPbMuJPmkWkq6h1QsGBOF Wl9mGEPpcD1apIuPSejIqAShiH1z6rbuUWM7kuXEZo3/NdhxPqq8f6UxfHVdRfyCFmXx cgUw== 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=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=IFy13iBNawACaes2wKjPSziBdr0hc3rOn0JGNIgFiA7vjja3zicLH9Cu3aPjISpSxd shoqwmVX8vpvtRHffg8dj/ZHvwQUgh4eZqP3iKv1eaGUJ2i+kvuyKDw5mlYnx0pDY3Ug xtZNlqcSwg4ov3+uEUnh0+9WycXdR1XYNaQMSK+ixVMzKYMP6a4VCmCd6ikS0PJrO5+P P6YQ8Gbhtt7F4xUKUJqaNronbWz9CUpRjTPPbd/k0b9KGgnyDNPVm2cSi4oBgqIWlNb0 7osPj0mV3R+W1dQXC5g0NLPtL9bn4xU43ZBACUH6iM9jXtMiDtWD5ZMRrOsms0N2dU8k Ttcg== X-Gm-Message-State: APjAAAU1LJ7JFBEw0ahXlBFrUE2rikq7FQ2v+uOtVA/K9Z/67PPanCX/ GOXJpPh6bhcuhscU4fZFnVFDRg== X-Received: by 2002:a1c:6483:: with SMTP id y125mr148521wmb.12.1552410916629; Tue, 12 Mar 2019 10:15:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y20sm6097167wmi.34.2019.03.12.10.15.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 762241FF87; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:27 +0000 Message-Id: <20190312170931.25013-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::336 Subject: [Qemu-devel] [PULL 22/26] tests/tcg/i386: add system mode Hello World test 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" This introduces the build framework for simple i386 system tests. The first test is the eponymous "Hello World" which simply outputs the text on the serial port and then exits. I've included the framework for x86_64 but it is not in this series as it is a work in progress. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target new file mode 100644 index 0000000000..53c9c5ece0 --- /dev/null +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -0,0 +1,46 @@ +# +# x86 system tests +# +# This currently builds only for i386. The common C code is built +# with standard compiler flags however so we can support both by +# adding additional boot files for x86_64. +# + +I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system +X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system +# Set search path for all sources +VPATH+=$(I386_SYSTEM_SRC) + +# These objects provide the basic boot code and helper functions for all tests +CRT_OBJS=boot.o + +X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c) +X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS)) + +ifeq ($(TARGET_X86_64), y) +CRT_PATH=$(X64_SYSTEM_SRC) +LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_x86_64 +else +CRT_PATH=$(I386_SYSTEM_SRC) +CFLAGS+=-m32 +LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 +# FIXME: move to common once x86_64 is bootstrapped +TESTS+=$(X86_TESTS) +endif +CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) +LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(CRT_PATH)/%.S + $(CC) $(CFLAGS) -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# Running +QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel diff --git a/tests/tcg/i386/system/boot.S b/tests/tcg/i386/system/boot.S new file mode 100644 index 0000000000..90aa174908 --- /dev/null +++ b/tests/tcg/i386/system/boot.S @@ -0,0 +1,172 @@ +/* + * i386 boot code, based on qemu-bmibug. + * + * Copyright 2019 Doug Gale + * Copyright 2019 Linaro + * + * This work is licensed under the terms of the GNU GPL, version 3 or later. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + + .section .head + + /* Multi-boot header */ +multiboot_st: + .int 0x1BADB002 + .int 0x10000 + .int -(0x10000+0x1BADB002) + // Load address + .int __load_st + .int __load_st + .int __load_en + .int __bss_en + .int _start + // mode + .int 0 + // width + .int 0 + // height + .int 0 + // depth + .int 0 + + .code32 + .section .text + + /* Kernel Entry Point */ +.global _start +_start: + // Setup stack ASAP + mov $stack_end,%esp + + // Load GDT ASAP + lgdt gdtr + ljmp $0x8,$.Lloadcs +.Lloadcs: + mov $0x10,%eax + mov %eax,%ds + mov %eax,%es + mov %eax,%fs + mov %eax,%gs + mov %eax,%ss + + // Fixup the IDT to the ridiculous i386 layout + xor %ebx,%ebx +.Lnextidt: + mov idt_00(,%ebx,8),%eax + shr $16,%eax + movw $0x8,idt_00+2(,%ebx,8) + movw $0x8E00,idt_00+4(,%ebx,8) + movw %ax,idt_00+6(,%ebx,8) + add $1,%ebx + cmp $32,%ebx + jl .Lnextidt + + // Load IDTR + push $idt_00 + push $((32 * 8 - 1) << 16) + lidt 2(%esp) + add $8,%esp + + /* + * Don't worry about stack frame, assume everthing + * is garbage when we return, we won't need it. + */ + call main + + /* output any non-zero result in eax to isa-debug-exit device */ + test %al, %al + jz 1f + out %ax, $0xf4 + +1: /* QEMU ACPI poweroff */ + mov $0x604,%edx + mov $0x2000,%eax + out %ax,%dx + hlt + jmp 1b + + /* + * Helper Functions + */ + + /* Output a single character to serial port */ + .global __sys_outc +__sys_outc: + pushl %ebp + movl %esp, %ebp + out %al,$0xE9 + movl %ebp, %esp + popl %ebp + ret + + + /* Interrupt Descriptor Table */ + + .section .data + .align 16 + +idt_00: .int 0, 0 +idt_01: .int 0, 0 +idt_02: .int 0, 0 +idt_03: .int 0, 0 +idt_04: .int 0, 0 +idt_05: .int 0, 0 +idt_06: .int 0, 0 /* intr_6_opcode, Invalid Opcode */ +idt_07: .int 0, 0 +idt_08: .int 0, 0 +idt_09: .int 0, 0 +idt_0A: .int 0, 0 +idt_0B: .int 0, 0 +idt_0C: .int 0, 0 +idt_0D: .int 0, 0 +idt_0E: .int 0, 0 +idt_0F: .int 0, 0 +idt_10: .int 0, 0 +idt_11: .int 0, 0 +idt_12: .int 0, 0 +idt_13: .int 0, 0 +idt_14: .int 0, 0 +idt_15: .int 0, 0 +idt_16: .int 0, 0 +idt_17: .int 0, 0 +idt_18: .int 0, 0 +idt_19: .int 0, 0 +idt_1A: .int 0, 0 +idt_1B: .int 0, 0 +idt_1C: .int 0, 0 +idt_1D: .int 0, 0 +idt_1E: .int 0, 0 +idt_1F: .int 0, 0 + +gdt: + .short 0 +gdtr: + .short gdt_en - gdt - 1 + .int gdt + + // Code + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x9b + .byte 0xCF + .byte 0 + + // Data + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x93 + .byte 0xCF + .byte 0 + +gdt_en: + + .section .bss + .align 16 + +stack: .space 65536 +stack_end: diff --git a/tests/tcg/i386/system/hello.c b/tests/tcg/i386/system/hello.c new file mode 100644 index 0000000000..821dc0ef09 --- /dev/null +++ b/tests/tcg/i386/system/hello.c @@ -0,0 +1,14 @@ +/* + * Hello World, system test version + * + * We don't have the benefit of libc, just builtin C primitives and + * whatever is in minilib. + */ + +#include + +int main(void) +{ + ml_printf("Hello World\n"); + return 0; +} diff --git a/tests/tcg/i386/system/kernel.ld b/tests/tcg/i386/system/kernel.ld new file mode 100644 index 0000000000..92de525e93 --- /dev/null +++ b/tests/tcg/i386/system/kernel.ld @@ -0,0 +1,23 @@ +SECTIONS { + . = 0x100000; + + .text : { + __load_st = .; + *(.head) + *(.text) + } + + .rodata : { + *(.rodata) + } + + .data : { + *(.data) + __load_en = .; + } + + .bss : { + *(.bss) + __bss_en = .; + } +} From patchwork Tue Mar 12 17:09:28 2019 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: 160137 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13200508oce; Tue, 12 Mar 2019 10:21:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFft7eLnN8js6Kfn77/xY8G9P4ZZe17gR3037RV5bwIJfnYyOUuSCZKcoDM558dU9ycEB8 X-Received: by 2002:a25:2a8d:: with SMTP id q135mr34437003ybq.394.1552411272473; Tue, 12 Mar 2019 10:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411272; cv=none; d=google.com; s=arc-20160816; b=OG4r+nv1iWklwvpSdoveLkhDLl8WGlanj7o24xfReL24RVoB5eo6282Fdzkfo961Fx Sx8Jl0o1RqLg1A2CMNE32wyuRTYoIb+3ZN6h+K5+CsjDCMZcRdf+DCpjqXP6xgh5fJYo 3OiaaatimX0h8Mo39i9nYMgK1qSBNAGs4Akn76vKliDfxE0GI2qn0T5a0jMny3hAx3+g 9h6r9MhBqEpof2jpm6DyER7yld2/scSqPbaujtGSxaGyC7B/iFFM9a1LspNaENrnpaBD ylxaTqEqMErtDEz9zY/NgS+0PhS9AUPlPdDdZvZpamMt88dDWLVUF40aMjG8Oq2/x469 cGWw== 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; bh=zQT+b4hrk1dfCTcbQ1yXe96TEFFzqf+SERHmGueS/P4=; b=XkZGB0GRkXC0c38xRmMViP1qDv2DWEKN1FBlC3Y1HvJ2hwTo4wEOxeUo1b1ZduiVty h/i/6f7+9aOB6VB2v9cLSsCx5e7xIK4nJcuS1Wah1aE/eCvjpwtPjakslQ6uBzNr7p8e q/Efhz8gu1HlXNzklCcp02UVfPyAT0xHkgbCxwd5knz83R5C9rllSFuiXURiB1+MxauG zZj9/D+PSBa4ivSYqsBzXbaMY+SFoNfCdCBglBR9gzWGf4DgrmdbTFROYlAAzXh5hUPV Hos0db8AgogyfdaH8sCL+Y1H/7VlK/4dQ9LG637YmJztu4E+lBKVK0fAt5UQ7bUbsd7P jC+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RnT+In0I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id i12si5147764ybp.85.2019.03.12.10.21.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:21:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RnT+In0I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l5T-0007G1-TV for patch@linaro.org; Tue, 12 Mar 2019 13:21:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2g-0005Wi-1a for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzo-0003wT-A9 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:22 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36120) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzn-0003uR-Qk for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:20 -0400 Received: by mail-wm1-x342.google.com with SMTP id e16so3373505wme.1 for ; Tue, 12 Mar 2019 10:15:19 -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=zQT+b4hrk1dfCTcbQ1yXe96TEFFzqf+SERHmGueS/P4=; b=RnT+In0IonNv7+3B5H/sO1x5a/XGYqHiyvIIqCLa23Pzn8bbAuCk3a205r0RLkqsLm yh1pBGmuzRN+12k2PROyZ2fm6IxeK3UEu8UCB3oOVhyWvYRzdQpsAUBsOqiOaOcL8Fb1 ldKew5e9y5zb09nax3KugPGpAvpKAse6RR9UY9BMytPfQfWZ3A7TS4KjeaFopWyptwlK oCUfk9M+fbOC66IjhYP0BCHpVpXMVD2+WiDT3zSQvcIYz7KT2YJfCD5eW5/pg15fXcFc /89bGoFNj9/d6srb71QZ5yTNexdQDLkLNCBeWHOA9QRKXk0MbcX5DSsoTvTXIjFGEDnr TEjg== 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=zQT+b4hrk1dfCTcbQ1yXe96TEFFzqf+SERHmGueS/P4=; b=Rzq2Fn7rC3LZqDQ57DCriHvlqH/3hwla4+LyHJcmg3HKEHDnnIa0aHrW8jKj7+N+MP Qe06tK4Y8oW2iS5+QO49qY9JHLjxxSILY/cyZ8ZLTJ1WEoJ8kjBaj4tUJQcqarEq/xvp q1TKKngo5ckR7eDjTgEBOcjOMwbQPlGvhaH4AFvVUP4U/9/N8KxHWcBMnUZu3jZx6KC2 EWLU2mL26yaZwMrduMIBi62ENXZRE1XB98nFZVOzNu7pFwY7vZ3itifDa+S3CbhYIOxj R/ILeL1n9qlxJPa9kQDlfMsZU7pNM6/5KC1Uy2Uv0t/tCJXpq865vZ4WXca6OGEBaFAk cSgw== X-Gm-Message-State: APjAAAUE2lx33dUSU1N8d1aNE6l+avFUtz1fP0gcMXWsxXdF6/lNw8qD KyJjPmeA9pZPZpcyCcoTcLiSOA== X-Received: by 2002:a1c:9ed5:: with SMTP id h204mr3213188wme.140.1552410918414; Tue, 12 Mar 2019 10:15:18 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o30sm14034167wro.57.2019.03.12.10.15.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 81EA11FFA9; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:28 +0000 Message-Id: <20190312170931.25013-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::342 Subject: [Qemu-devel] [PULL 23/26] tests/tcg/i386: add memory test to exercise softmmu 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" This is a simple test to check various access patterns to memory including unaligned access. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/i386/system/memory.c b/tests/tcg/i386/system/memory.c new file mode 100644 index 0000000000..a7a0a8e978 --- /dev/null +++ b/tests/tcg/i386/system/memory.c @@ -0,0 +1,243 @@ +/* + * Memory Test + * + * This is intended to test the softmmu code and ensure we properly + * behave across normal and unaligned accesses across several pages. + * We are not replicating memory tests for stuck bits and other + * hardware level failures but looking for issues with different size + * accesses when: + + * + */ + +#include +#include + +#define TEST_SIZE (4096 * 4) /* 4 pages */ + +static uint8_t test_data[TEST_SIZE]; + +static void pdot(int count) +{ + if (count % 128 == 0) { + ml_printf("."); + } +} + + +/* + * Fill the data with ascending value bytes. As x86 is a LE machine we + * write in ascending order and then read and high byte should either + * be zero or higher than the lower bytes. + */ + +static void init_test_data_u8(void) +{ + uint8_t count = 0, *ptr = &test_data[0]; + int i; + + ml_printf("Filling test area with u8:"); + for (i = 0; i < TEST_SIZE; i++) { + *ptr++ = count++; + pdot(i); + } + ml_printf("done\n"); +} + +static void init_test_data_u16(int offset) +{ + uint8_t count = 0; + uint16_t word, *ptr = (uint16_t *) &test_data[0]; + const int max = (TEST_SIZE - offset) / sizeof(word); + int i; + + ml_printf("Filling test area with u16 (offset %d):", offset); + + /* Leading zeros */ + for (i = 0; i < offset; i++) { + *ptr = 0; + } + + ptr = (uint16_t *) &test_data[offset]; + for (i = 0; i < max; i++) { + uint8_t high, low; + low = count++; + high = count++; + word = (high << 8) | low; + *ptr++ = word; + pdot(i); + } + ml_printf("done\n"); +} + +static void init_test_data_u32(int offset) +{ + uint8_t count = 0; + uint32_t word, *ptr = (uint32_t *) &test_data[0]; + const int max = (TEST_SIZE - offset) / sizeof(word); + int i; + + ml_printf("Filling test area with u32 (offset %d):", offset); + + /* Leading zeros */ + for (i = 0; i < offset; i++) { + *ptr = 0; + } + + ptr = (uint32_t *) &test_data[offset]; + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4; + b4 = count++; + b3 = count++; + b2 = count++; + b1 = count++; + word = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4; + *ptr++ = word; + pdot(i); + } + ml_printf("done\n"); +} + + +static int read_test_data_u16(int offset) +{ + uint16_t word, *ptr = (uint16_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u16 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t high, low; + word = *ptr++; + high = (word >> 8) & 0xff; + low = word & 0xff; + if (high < low && high != 0) { + ml_printf("Error %d < %d\n", high, low); + return 1; + } else { + pdot(i); + } + + } + ml_printf("done\n"); + return 0; +} + +static int read_test_data_u32(int offset) +{ + uint32_t word, *ptr = (uint32_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u32 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4; + word = *ptr++; + + b1 = word >> 24 & 0xff; + b2 = word >> 16 & 0xff; + b3 = word >> 8 & 0xff; + b4 = word & 0xff; + + if ((b1 < b2 && b1 != 0) || + (b2 < b3 && b2 != 0) || + (b3 < b4 && b3 != 0)) { + ml_printf("Error %d, %d, %d, %d", b1, b2, b3, b4); + return 2; + } else { + pdot(i); + } + } + ml_printf("done\n"); + return 0; +} + +static int read_test_data_u64(int offset) +{ + uint64_t word, *ptr = (uint64_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u64 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4, b5, b6, b7, b8; + word = *ptr++; + + b1 = ((uint64_t) (word >> 56)) & 0xff; + b2 = ((uint64_t) (word >> 48)) & 0xff; + b3 = ((uint64_t) (word >> 40)) & 0xff; + b4 = (word >> 32) & 0xff; + b5 = (word >> 24) & 0xff; + b6 = (word >> 16) & 0xff; + b7 = (word >> 8) & 0xff; + b8 = (word >> 0) & 0xff; + + if ((b1 < b2 && b1 != 0) || + (b2 < b3 && b2 != 0) || + (b3 < b4 && b3 != 0) || + (b4 < b5 && b4 != 0) || + (b5 < b6 && b5 != 0) || + (b6 < b7 && b6 != 0) || + (b7 < b8 && b7 != 0)) { + ml_printf("Error %d, %d, %d, %d, %d, %d, %d, %d", + b1, b2, b3, b4, b5, b6, b7, b8); + return 2; + } else { + pdot(i); + } + } + ml_printf("done\n"); + return 0; +} + +/* Read the test data and verify at various offsets */ +int do_reads(void) +{ + int r = 0; + int off = 0; + + while (r == 0 && off < 8) { + r = read_test_data_u16(off); + r |= read_test_data_u32(off); + r |= read_test_data_u64(off); + off++; + } + + return r; +} + +int main(void) +{ + int i, r = 0; + + + init_test_data_u8(); + r = do_reads(); + if (r) { + return r; + } + + for (i = 0; i < 8; i++) { + init_test_data_u16(i); + + r = do_reads(); + if (r) { + return r; + } + } + + for (i = 0; i < 8; i++) { + init_test_data_u32(i); + + r = do_reads(); + if (r) { + return r; + } + } + + ml_printf("Test complete: %s\n", r == 0 ? "PASSED" : "FAILED"); + return r; +} From patchwork Tue Mar 12 17:09:29 2019 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: 160141 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13203616oce; Tue, 12 Mar 2019 10:23:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqykFs66sv45PlUOZdaJfsONEnQk02FJotGHsj8UjCzgJKoeESuZLBKhbtXSHIfDZc3OdrHr X-Received: by 2002:a81:4f45:: with SMTP id d66mr11503000ywb.300.1552411431389; Tue, 12 Mar 2019 10:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411431; cv=none; d=google.com; s=arc-20160816; b=ruusCX5s3d9DfB+8xb/j8/WR6Ghz8WT3JGjii4cqTq7J0Xmm6qaiFL6LRShHEfoUdC 8M/zL9rz4WDeHITFsiMOm5gY2W/ShK1qhBTh/+Vm0ACrgI7GYsjVxEa8KDRDdg4gvzQ+ RmLSa5gVT9UXN+MyFwBw5vmD2UweQ+Dl8W+ByRoKYt1oPM2tWI2OR4IaEL9AEyIKXmLA FsByCJYR1n6ivlquh9AWlYEQTtVcTTwnDarXYFVRlbJllfVmfDgU4SNe62YNQ3DBTRTV fit0SGxxg5bnD6Nl9J66CiGt7LkdpxUiJTHstQCJs3Q2hmumUH7YJsNe/G8nvcirraBW UJSg== 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; bh=uqgDo1KcEvn9lv+Z25qAFkOJ8Ui5IkK1GQOdtbOxZPs=; b=JCIOJzb2p+S/aDgy+YQ8XRGQgRfj6hY3dIcS+TgQAe09Uc/yoK0hkhXR8KazOAgMVL +OXtpVJjSy8eadZ2eh8pJtfucaciB1KdPQoE8+s2jVHjUUQqpTc4x2BwoPl/Ydk07x5D AYSC96pWA3F3MoSP+4Ah9BnnuqWpj8JgaLWwChEly9w32iUuH1AY9ABAHauWyE7y2hrY fUn4poZoSS3ICzxFgekDum1fhMMmD9G+NYewxqcC+GQBi139A+XbMINfgKe3kbOyS7dF AVouxRIJahbhMvAK5rlZuKp+GGu2J+fIXEdrwIRXoJ9TQPHwpQ/2x6hUXRJIa+fE0e44 Ltfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CUlnqUCv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id g135si4563649ywe.406.2019.03.12.10.23.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:23:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CUlnqUCv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l82-0001VH-Ps for patch@linaro.org; Tue, 12 Mar 2019 13:23:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2i-0005SB-7z for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzn-0003vP-LY for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:21 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzn-0003t6-BX for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:19 -0400 Received: by mail-wr1-x433.google.com with SMTP id t18so3593167wrx.2 for ; Tue, 12 Mar 2019 10:15:19 -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=uqgDo1KcEvn9lv+Z25qAFkOJ8Ui5IkK1GQOdtbOxZPs=; b=CUlnqUCvpaDmV7f2uQQ8r+fUJ0lbdQYNmtLmTSO12dTYbKf5lwVZrcBybFKz8XxwQM RM6w6/a/1zy/oIJ2PiKN5YsOUCqVMZ2xAE/ViVvYXU/xu+gAWTg/TD/x/hKJMf4cjjlf YljQGAEYbPp9cV68uK+/EJMoYu4SxbHF96Jh3GqiAiWRAYKWwYqI2yXEXSJD6v4xr89H BjSdvg9nFJ7GxYiMHLKvlii4WK3UUdNbJeSxIgSgIt0Elb0wX3DQmzFenQzrNs60NAbi im+kpLX3JacJ/xWhW8XiFMyD3c3M7oZNSaWSl2jBxipazkcG7mXwJ6rBbxywZfdX7tCW 3dzw== 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=uqgDo1KcEvn9lv+Z25qAFkOJ8Ui5IkK1GQOdtbOxZPs=; b=OnT+XYD0Fj12g3TaBi8C7ud9dAMyNyVrtGdRPqn50Ymox2GYk0seHZcVXBM+Kj9Ocr tqgAz8gyf3gLFIs2aAx9V7FMJX8E/oiOW73UQzAobfPT15WqGsoGgCNkoF85JVtZAY0A kTg6EtuuZFWZ4jtMWvxJnYt+enaffVlDdGHPxLN6O6Z5c/Sr8EHUDiHawV8k4as+1vsb 0x3KDE9S1vIeFt+5sncDAvPakU9NpLTP2X3IzLZHhdxwTg4hQ6oZ6QL63c1qdVzRbLHH X6ILdPN4DEHHNfuAlW3nfhuzCTGjw1fWJ1eE7SjfwLqUxQVvVu9KCIGO4V036gxrEGjA 1lpQ== X-Gm-Message-State: APjAAAXaU0HZVYNXANFmvIVefxixManXnm1XLZWLXLetynURT14KgeO/ oht8X1AlEqXdScU4qgLQqzx0mrAFJmw= X-Received: by 2002:adf:b7c1:: with SMTP id t1mr23887777wre.248.1552410917859; Tue, 12 Mar 2019 10:15:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i12sm16353351wrq.21.2019.03.12.10.15.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8D90E1FFAA; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:29 +0000 Message-Id: <20190312170931.25013-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::433 Subject: [Qemu-devel] [PULL 24/26] tests/tcg/arm: account for pauth randomness 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Pointer authentication isn't guaranteed to always detect a clash between different keys. Take this into account in the test by running several times and checking the percentage hit rate of the test. Cc: Richard Henderson Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/aarch64/pauth-1.c b/tests/tcg/aarch64/pauth-1.c index ae6dc05c2b..a3c1443cd0 100644 --- a/tests/tcg/aarch64/pauth-1.c +++ b/tests/tcg/aarch64/pauth-1.c @@ -1,5 +1,6 @@ #include #include +#include asm(".arch armv8.4-a"); @@ -8,16 +9,29 @@ asm(".arch armv8.4-a"); #define PR_PAC_APDAKEY (1 << 2) #endif +#define TESTS 1000 + int main() { - int x; + int x, i, count = 0; void *p0 = &x, *p1, *p2; + float perc; + + for (i = 0; i < TESTS; i++) { + asm volatile("pacdza %0" : "=r"(p1) : "0"(p0)); + prctl(PR_PAC_RESET_KEYS, PR_PAC_APDAKEY, 0, 0, 0); + asm volatile("pacdza %0" : "=r"(p2) : "0"(p0)); - asm volatile("pacdza %0" : "=r"(p1) : "0"(p0)); - prctl(PR_PAC_RESET_KEYS, PR_PAC_APDAKEY, 0, 0, 0); - asm volatile("pacdza %0" : "=r"(p2) : "0"(p0)); + if (p1 != p0) { + count++; + } + if (p1 != p2) { + count++; + } + } - assert(p1 != p0); - assert(p1 != p2); + perc = (float) count / (float) (TESTS * 2); + printf("Ptr Check: %0.2f%%", perc * 100.0); + assert(perc > 0.95); return 0; } From patchwork Tue Mar 12 17:09:30 2019 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: 160142 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13203792oce; Tue, 12 Mar 2019 10:24:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdCtRb9b5Y85ixZc9gd2UH+cqrL0PY9QoKXSrCcQZthHvI72lql1hwYGL0dzYakA7zwqej X-Received: by 2002:a25:c8c4:: with SMTP id y187mr32068956ybf.414.1552411440729; Tue, 12 Mar 2019 10:24:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411440; cv=none; d=google.com; s=arc-20160816; b=THIroKiskNUdzfCtnx47Z7Y52QeuzbwvfX5Af7nM5ZJ8biswp9B5zSbSR+Aysoc4VV etacBBhEhLu8Mv34HxB/9u0fAKWF99Q42i/lraAIDteFzhWST/4rfVMN0jb8Z8fQRKlf edvEathOtixXrinyWpqBRqNdHtquWQeUgPApxd7iFIEpgHXV9pZc0QpJcwz2r3x5bzW6 zGpXXvSGzUV6RP4kdcQN5zzAuvkiEd5rBPSbQ2qePCDcRgc+aKUGNpTjvaFPJ4SnkOvV ZRYc6YwaEyo20JPnsV11GXlDE4JxXqnJ//H3fiDDq9YEPJAM43wNpP+FvmPNFIFsKGzs r/cw== 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; bh=C5Zd8uUOMS9aKMJVIGckF1cai6B6O5fZ8e5v1fozPEA=; b=KLhNEJwf2wbDEXdNwRHPVuV6K/P0CUW4bOeChzRmdWQgCu1kt2TuNsM/eUKFhQ04Yo Y+5A1lABg4q7HCBRz+9bD6f7haBxEBbdM0ryV7+ba9I97uBcNc+XqT/Zr77kIjJCSgWs SY+Veoy3PYDUyXtk8JOmxlhgZMh5cIfvHURMKRqlMtZaWNFCoOsboBDRIrXBxVUKT4QB p6WAOgzAXfSHnNv3mzj7I9p0c1n3CpeVmRR1M7ShGLVEJb7YqjnfDATvzI4xAeU0PaFf jpzCoHSSAYe7AXgFOdspwW+cMTAJy/tsLHOaI9J1e8skRTB08zyJfqLwRKJ7RiOgrfkT BDdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kxnEZh4y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id p199si5577106ywg.433.2019.03.12.10.24.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:24:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kxnEZh4y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l8C-0002Ts-6F for patch@linaro.org; Tue, 12 Mar 2019 13:24:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2j-0005Wi-7A for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003tZ-O2 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:19 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:35983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003oB-BO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x334.google.com with SMTP id e16so3373000wme.1 for ; Tue, 12 Mar 2019 10:15:11 -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=C5Zd8uUOMS9aKMJVIGckF1cai6B6O5fZ8e5v1fozPEA=; b=kxnEZh4y/GyekE8AcDkXtechdkaHfd98d2ag3AAvarC8fotJ/iGfgNpRHRgxjUks9q Iqcaxg51fvvlhA1/gYbsDAremd2LndLrP0P7NmWHZ+A3d1ydXT4ZxvqsLVAhbyoOwlvw KqGv7nUSlzf+GQa8Zc3H5wp/FnaMGce/pLRlmDpOt3mjDWbnnQwXoP1muNPP9aiRBHnc /tJSGV1IZBPS4JtUhjh2VeJY6hL4l3QxExvcqIHvDvHTOeYx0savWq+mZrKr075NS+Y8 SR9BeJtOr/Wca9GFiuYloD05a3+SOjIfA/4t3ZO11FZy1n0glE+R5h+GscvwT8KRDbkw GRWQ== 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=C5Zd8uUOMS9aKMJVIGckF1cai6B6O5fZ8e5v1fozPEA=; b=ckugKzlXZfTO5MQdS1n/OZ86fwqafTAlwAsT7pmgpMy/CPabXb4XLbY+FsPtYUjrVM 5xTTJtUqZhzRbL7cYkPBRxUJQchrGdGp6gEf2j0K/Cg2fzdVqmuTGEMa5yjjDCslk94n GL9iGrvz2N/pILbxHKYMnU5nTqsu+IgkPOWna7dQ0VWDP+3XrdnIVhsKF61z3AUM/MlU b/TscsHMpLKZijzseaKgA7tkS2XcZ6BHDvENytSixO3qnPXsBtpyx+fNpHZfFdVNHSqE 2iJFBbcMGPhUbuihVl+C5Rs/u3UFmMjQaYqhQI6tvoMUZbE/oR0QXF7bIR+DUZssWyxY xkgA== X-Gm-Message-State: APjAAAWRYG+4ytgGyob/PPCPtjhO0pmuUgXBsaMjyisOI2KILEVVAnA0 nhG1F96ghzN8mLvaFNtnw741yQ== X-Received: by 2002:a1c:5f86:: with SMTP id t128mr3100384wmb.87.1552410910426; Tue, 12 Mar 2019 10:15:10 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p12sm7960577wrt.4.2019.03.12.10.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 994851FFAB; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:30 +0000 Message-Id: <20190312170931.25013-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::334 Subject: [Qemu-devel] [PULL 25/26] .travis.yml: separate softfloat from check-tcg 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" While used by TCG it is not explicitly part of TCG and the tests can be run standalone in a minimal build. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index d5c9bbf1b2..b02e7318c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,6 +85,12 @@ matrix: - CONFIG="--disable-user" + # Just build tools and run minimal unit and softfloat checks + - env: + - BASE_CONFIG="--enable-tools" + - CONFIG="--disable-user --disable-system" + - TEST_CMD="make check-unit check-softfloat -j3" + - env: - CONFIG="--enable-debug --enable-debug-tcg --disable-user" diff --git a/tests/Makefile.include b/tests/Makefile.include index 75b682cbe8..852f17b8c7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1090,7 +1090,7 @@ clean-tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) .PHONY: check-tcg -check-tcg: check-softfloat $(RUN_TCG_TARGET_RULES) +check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) From patchwork Tue Mar 12 17:09:31 2019 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: 160145 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13204252oce; Tue, 12 Mar 2019 10:24:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+073j6igpHLqwnyISja4W//HSnSKsXg+mUu5V5AYB13Jul2oo6rVi3Rompy3jZkWtkxpz X-Received: by 2002:a0d:eb82:: with SMTP id u124mr4381437ywe.434.1552411463018; Tue, 12 Mar 2019 10:24:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411463; cv=none; d=google.com; s=arc-20160816; b=EF2XS53X1yMhygAWKLvvHHxVMRAO7J27J+z+ku3wLeGfa3Cu/UDfxXSalTfhQwkTVo qtX6sGQ5s0oq2gYMzTE533/kpA4oIIXr0np3NN7TKl5wxRSOtQJdPKMRIp0nP54em6wI JhmZozokggRO0laK68PnS95eeLdVGwcMSAWwvmAXEUSb959vrXG0WQqk+hX1jHIcc5ge xPYy36mDi6NEQLDFJeHnrOYsXebKfV7UnfuBAuscl5kxT5wkN4nlqu6j+T/acBxRV+tY uHqVEsjsWoR9edfNfyggJVf9sl9VRGAUHkj8yQav4H3HDtMUDVUip/Y9zsxQIGJPDJui 1mSw== 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; bh=KlnSPLzst/8sVlmVFeZlSJuOJSzrqIZXcaZFQtCnRI4=; b=i67YqiSqaImyw6NnQUtOnvz6hVx++H6hRrZmZYT9uuVZRwDdsq9VK00l76zhglfpdu uXCkQ8kOWs0ztDmk62t6B10SHYDTIUVHoCMe9HEwvBxYSMHOfHUTgcmT6HIszp+lGYv8 kyjFJWrNmmc2D+PLUyCi/a1wKjkKb5hmXRRK11kIYOrEQesp0Zotk9gfjcJRjw6dqnS/ rv6/msa03nm4OYTtlId9ds1U8QowkWhNDs1hAO+AM30rprUubUfEkCUDc2II14GtaJQq xIQG1YoZFvkW88vttMZQYG6WhrhU5HFrXLrm13gVfnSpvcbg2F9RdjhSd5iUQFLSB/Rh BD0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gbJ9IJtZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id p7si5522504ywb.171.2019.03.12.10.24.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:24:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gbJ9IJtZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:56335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l8Y-0002o4-Ff for patch@linaro.org; Tue, 12 Mar 2019 13:24:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2j-0005UY-Oo for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003tl-P8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:53046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003s3-DA for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x330.google.com with SMTP id f65so3525597wma.2 for ; Tue, 12 Mar 2019 10:15:17 -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=KlnSPLzst/8sVlmVFeZlSJuOJSzrqIZXcaZFQtCnRI4=; b=gbJ9IJtZ5yYHqIfvU7cSzeCSB2daieMOydidMzuSdVDwlufO+tIyaHXnkDoyQ7qlbo ZUJp/PfBO9jn15erCjsYFQmJpM3x0OCH6WPcuUWSdNl3EGe0Pc2FXTnxcygRZsXTzCra dxAZHOdAqGmsWd9N2knHCbyTV0Bofif8JGyrfluTiVujnS5FqNWLZwvrgG/HbEI8knFX 6mFcd+J32q4B3szpZq9aDJ1t6E1Wz65yZS5M2HAZch3zOslxG6Olf3co88E0gdwNklhF orkz1VPM3ew4kdkikLRjSyftBTqS+I/V+1Uff5a78RXloI1tc4Un597BlkUqfWvGgZBC Z6kA== 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=KlnSPLzst/8sVlmVFeZlSJuOJSzrqIZXcaZFQtCnRI4=; b=jB/hIB4yGibj44sf9z9duqzQ7SFbIkUP9CTfpdVXYk/RCb7Cu1HndwdDiUN4Lkx4Dl P2VsUTpQbOMlYKYsH2Bm8GvHcKoDSYeBhXAQfyBbCy9dHkgAqF3yz0vkB43pU6H5muUn RWPbCFVKs/DMDUm2Z8i2nwp/W7167keHcN0Hph/v294Tp7reXvlclS4onctKbTttCp+m BqtfPhNmpNg1vmLLm044Wtwso2sUlWfcmNcu2IhMIwl8ix4DAPPfrizcKjh+5nA/qAL2 qpXh0sqQox329MDTiQ8yiDDrjUY9hjnbxgXlCaDve2Cr0yQFP6bGsdRzsb489gNB6iPc Lzfg== X-Gm-Message-State: APjAAAVfRsxNaCYDrWk4HsGGHgcJyXC5Rb6Y4jSJcuGnjMq5ytxsykMX mYgpdPHQMr20223iBwk4AszvVA== X-Received: by 2002:a1c:2885:: with SMTP id o127mr3409153wmo.135.1552410916123; Tue, 12 Mar 2019 10:15:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z8sm2769383wmi.28.2019.03.12.10.15.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4DE91FFAC; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:31 +0000 Message-Id: <20190312170931.25013-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-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:4864:20::330 Subject: [Qemu-devel] [PULL 26/26] .travis.yml: add softmmu check-tcg tests 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" Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index b02e7318c1..980fc5c1eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -265,6 +265,12 @@ matrix: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; } + # Run check-tcg against linux-user - env: - CONFIG="--disable-system" - TEST_CMD="make -j3 check-tcg V=1" + + # Run check-tcg against softmmu targets + - env: + - CONFIG="--target-list=xtensa-softmmu,arm-softmmu" + - TEST_CMD="make -j3 check-tcg V=1"