From patchwork Tue Jun 19 15:44:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139215 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5413009lji; Tue, 19 Jun 2018 09:27:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI9djtVextaBcpHUVeNnRdnKIgwZraSNmYNMUF/ZwDMBcTupGS2xQ8mWF6KCXlRjzojFI/V X-Received: by 2002:ac8:44d3:: with SMTP id b19-v6mr14938414qto.167.1529425659963; Tue, 19 Jun 2018 09:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425659; cv=none; d=google.com; s=arc-20160816; b=PvIKVRvI3ozOcqYIkE0EWvqiywfkSeKueXmN5w12hFhwbPDIlaJoy8tM6DlI+PCxon nd/fZZJwUY3UpBGjBjSXvoG0JTo2LtlqSPtNd3ZJiGg2IXLTb4F8YuaTnqOfuw0YoEJM mZB+8AuRVRoJnN3hxnYFLUn6QO7kbyqI9F4uafgC+cqDyT5c2Znt0qYo1L8+NFcEYoHM QrJXOJmyARzi2NRGMNdpovYa/BiO2rxNOFlegPrWcKO7eS7Po9n7tQ8nxv0J9NCYw/E4 x2wYNg/j9Wrj4Ov5P0lvbe2X7iinQM8Jh9QK8EOKpxUO3jVozgNA5/xArwUqIaHO5anP /3qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=6+AMn1W2v9hYqhazUSto0ta42DWgae2M+2eCBXNiI2o=; b=jmQP3v/cxK6Qe6RvFsXY2GKb96VA2LqQQldBMevn65yq6Ej2WRsRXUz0U4+UXnX7D+ UMCfVNygmY7518NrylBijS2jvBn0WFfS7syk2FjCrH79GEPiHtR24hdGXOheO0OSmShL CikPy7mVsHaDpWXUNmdpa71qhanz9CtqugpTFUy/+PUmFWnQLC0EzGRP71RW/zWyylFs UV1SQ3NrxG0zgY/351/XU3Zcm58DE+ZvsF5HVPuu/+0qCEN45ZdATsDKpbANHuXBr8Be YjaXXab5SyHN2TirZoeftVLOP7NVNaLl2uPWMN94sE0qkIofp+XrEFmWO83fDtoPTQhX A0KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e0DJoKd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l5-v6si106215qvc.98.2018.06.19.09.27.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:27:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e0DJoKd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJTn-000086-9g for patch@linaro.org; Tue, 19 Jun 2018 12:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ51-0004gr-Uk for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4v-0007e2-U0 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:04 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:54423) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4v-0007de-KS for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:57 -0400 Received: by mail-wm0-x230.google.com with SMTP id o13-v6so1241853wmf.4 for ; Tue, 19 Jun 2018 09:01:57 -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=6+AMn1W2v9hYqhazUSto0ta42DWgae2M+2eCBXNiI2o=; b=e0DJoKd4y6kdHWN4cAk5cYZJavDe5lFh2RZBQZbW3zcXqJDbyMecdzguhL5GJks5AR w4qyR03TWNPcsoOvmto8lvsPshPpJA0utOL9OnLNR+IbbfraIhQ3kU9wXLdzPbj71Cl8 32brvKfAtjBc6YOc5nyhctMNHFgI2UsnvG34E= 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=6+AMn1W2v9hYqhazUSto0ta42DWgae2M+2eCBXNiI2o=; b=pHXSfjUj57KFlCkeGIrrb2pfY872EbesNZ68IStDnsRgeXeY7lpzajVSYADtpd3aYC vwQFDT4czfVV7Sk53Tji8vlSjQ/NBUhdWznIGCkzWIA2Lj7CHeAHT7fbAb6mUYniOoou SO8cc1V1xeWInzlZK496fzKl262tLY4LRQnmg5hmLq+ZtDK1QI3H9FMuWeXqb0Mku7Bh qnnIdsFGUU5xgr2sMPMvhbDjqYYTQ2mwPKj8Pq/QdmkmpY/hBLzAIwSKv1DTK6dWFr7J clkHjNlsndb6+qMTZepUoYLGDKhLVXzjSIA5dFxkPC8Ua2zDWy/2jnZRLtH11/ivgoow 8h/g== X-Gm-Message-State: APt69E2HKR0qe5c6OKC+FmGka6X9aU0iwCc0d76qEn5BWlZo5vU39Foj w30zvjdfGIfq2Dl3mnfTARv5Fg== X-Received: by 2002:a1c:9c4c:: with SMTP id f73-v6mr11732216wme.141.1529424116409; Tue, 19 Jun 2018 09:01:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15-v6sm90917wri.14.2018.06.19.09.01.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:53 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 65FD23E0D45; Tue, 19 Jun 2018 16:44:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:12 +0100 Message-Id: <20180619154435.18898-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't use our normal Debian based compilers as Alpha isn't an officially supported architecture. However it is available as a port and fortunately cross compilers for all these targets are included in Debian Sid, the perpetual rolling/unstable/testing version of Debian. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v5 - drop the unused debian-cross-build docker image - add note to debian-sid docker image - echo reference to notes on build failure - include EXTRA_RUNS for mmap tests v6 - use NOCACHE=1 for docker-image-debian-sid to force re-builds - this seems a little hacky -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 4a2b028a3b..8c24f8807e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -64,6 +64,13 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe + +# Debian SID images - we are tracking a rolling distro so we want to +# force a re-build of the base image if we ever need to build one of +# its children. +docker-image-debian-sid: NOCACHE=1 + +docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker new file mode 100644 index 0000000000..29a25d0dfd --- /dev/null +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -0,0 +1,12 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the debian sid base image which +# contains cross compilers for Debian "ports" targets. +# +FROM qemu:debian-sid + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker new file mode 100644 index 0000000000..9a3d168705 --- /dev/null +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -0,0 +1,32 @@ +# +# Debian Sid Base +# +# A number of our guests exist as ports only. We can either use the +# ports repo or get everything from Sid. However Sid is a rolling +# distro which may be broken at any particular time. If you are +# unlucky and try and build your images while gcc is in the process of +# being uploaded this can fail. Your only recourse is to try again in +# a few hours when the repos have re-synced. Once built however you +# won't be affected by repo changes unless the docker recipies are +# updated and trigger a re-build. +# + +FROM debian:sid-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +# Install common build utilities +RUN apt update +RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + flex \ + git \ + pkg-config \ + psmisc \ + python \ + texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } diff --git a/tests/tcg/alpha/Makefile.include b/tests/tcg/alpha/Makefile.include new file mode 100644 index 0000000000..c7dc48eadb --- /dev/null +++ b/tests/tcg/alpha/Makefile.include @@ -0,0 +1,2 @@ +DOCKER_IMAGE=debian-alpha-cross +DOCKER_CROSS_COMPILER=alpha-linux-gnu-gcc diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target new file mode 100644 index 0000000000..bedf1b6444 --- /dev/null +++ b/tests/tcg/alpha/Makefile.target @@ -0,0 +1,6 @@ +# -*- Mode: makefile -*- +# +# Alpha specific tweaks + +# On Alpha Linux only supports 8k pages +EXTRA_RUNS+=run-test-mmap-8192