From patchwork Wed Jul 17 13:43: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: 169124 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp989497ilk; Wed, 17 Jul 2019 06:43:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbQ8iPWmdJD5jgeS9pD+qG/bT6OswAF9uoHmLbU8HFmYAuIMSlyH4HVgt/s5FtFEbPUhxK X-Received: by 2002:a17:906:b216:: with SMTP id p22mr31584215ejz.273.1563371026358; Wed, 17 Jul 2019 06:43:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371026; cv=none; d=google.com; s=arc-20160816; b=bYmav7QyX8PahhT7xJMDHyPuQonBNZevmwvrT/gSlUJiGCDfs6KgMtsnfWfAjcjm/j b5J8mUyRigMPfajujg3EU9ZOW7X7Fv25nGzwFOaqZ7rM1Q7PX+B2iMUVFOx29ZH/Dsub YHd1j8gVAqGsy36hijp80+X3JE+qIxix0GT4SiG+UoZK05DNgPA/wBvyytPKckxcf1nk 7oV1SaA8tFuMPnZuteZRH79Qy2WjaHL3nieH26AJ1zgDZ2r2GhNzF1sP7zNiQTNay548 ixcUlpLimkhnxceD2PlbkYACVzxCcjpTyexaUcZ9AWN8PQ6U7AD1ZLBn2zbFWPQxZTMy WeaQ== 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=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=HwnO/VylLQ6h/aBOfS6Uz7iWOqTGzRMeNyMmv9oR779lnaYrCoNSeEQWKIjlY+zr5t 2bCIGnaN2jqYqMEjRH+C+oZWqjSZBEeCWJ/DYz/nqOzy1QbmDRhH+oA/n4LRh7b9GSON qiKfBYRipfBttFWabqsuxZpujaDDFEzCcN76SeQPzGErY4xleEJ35EHXYyXgu5MXQfVw 16dIooZs77Pui+UWb4qsQxoFdkQ7cDpc1cmulHmJ7+JOfefGeO0MhuZoj0BhHhBB/mV+ DjM708YEH0Ui5E9cu9RgzkRNQ44fmMVw4YJqIX4G3xL+olSXPxCgmnE2Tg1K7Yfk89rt ssUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=A56w0WBT; 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 u9si12523731eji.97.2019.07.17.06.43.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:43:46 -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=A56w0WBT; 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 ([::1]:57256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDh-0004wY-0j for patch@linaro.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55252) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDb-0004w3-Ol for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDa-0004So-Lb for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:39 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35520) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDa-0004SC-CA for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:38 -0400 Received: by mail-wr1-x444.google.com with SMTP id y4so24909492wrm.2 for ; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=A56w0WBTwgshw6Om7Y2cfUU80UEmSFZ0UoHQKNF9MESrLucdnM4yVB1S3yokjNjdZp FASVdG3kb0JM8ftwcHR4rllm13aHqQ1NrzThD79o4OY17AxzD6mW9oyd64Xxg1KE7Pi3 Nqdqc+pV0hP6Fd8K44DITEXX0dehsjvMpHMU6EA22njjjketYCKWX00MbY0NjHi39zNG 6VwfA4hJXKbWrQGx14GvO1zJelVnAv6gX25y1KP7u2/CxtL6cNbUpK/UnD7y4D5mzlCj ie3ZDB8OxQ/rjrHGAP+RebmKiBL96oNCK3Mf9K10nwMo/oRQAppDLTi8t/q7C6xbP3YW XhTw== 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=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=IWh9slc9trZdW7d0oqQRpeH5Jcs+tKWrKgv6RXLhgh8iGqZZLLqUXdcgxoCgf8m1qB SmQXuuvjHnpiUBIRPsQge4UWgFuUEevAnFnjtt3IQ6UL09FyC+/dUZgunRZXvuZs/Nu5 m1NoH3bgGsTUzuGnQqeiTTvSPCWeJEFLaXVXUIzEsI7OaTngHAfLahpctpG6nU+G6ixj fBt/C8OqrnRwB+KpJ/ktgwHR99S2R/zpIa0/nEyAZqKKiURdAna11B52GTe1D1O7uQRk bWW5q2gY94sO8zKIEjkzBZQAq7kAFTlflCTqrxByTbxgI3H0Mp7eCoXiLXxYDnBJpjME l0Kg== X-Gm-Message-State: APjAAAVJ8yb51Dh+ObqBfWjnGQsTXO4yMuS5UEt0O0IYJy8dsUpw9dLR Gi5V+QG8tQATbCavHspKEKbBYA== X-Received: by 2002:a05:6000:12c8:: with SMTP id l8mr44708060wrx.72.1563371016856; Wed, 17 Jul 2019 06:43:36 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15sm38821810wrt.77.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB31A1FF8C; Wed, 17 Jul 2019 14:43:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:13 +0100 Message-Id: <20190717134335.15351-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 01/23] archive-source: also create a stash for submodules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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?Marc-Andr=C3=A9_Lureau?= , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau "git archive" fails when a submodule has a modification, because "git stash create" doesn't handle submodules. Let's teach our archive-source.sh to handle modifications in submodules the same way as qemu tree, by creating a stash. Signed-off-by: Marc-André Lureau Message-Id: <20190708200250.12017-1-marcandre.lureau@redhat.com> Tested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- scripts/archive-source.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index ca94e49978f..fb5d6b3918d 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -39,14 +39,16 @@ function cleanup() { } trap "cleanup" 0 1 2 3 15 -if git diff-index --quiet HEAD -- &>/dev/null -then - HEAD=HEAD -else - HEAD=$(git stash create) -fi +function tree_ish() { + local retval='HEAD' + if ! git diff-index --quiet --ignore-submodules=all HEAD -- &>/dev/null + then + retval=$(git stash create) + fi + echo "$retval" +} -git archive --format tar $HEAD > "$tar_file" +git archive --format tar "$(tree_ish)" > "$tar_file" test $? -ne 0 && error "failed to archive qemu" for sm in $submodules; do status="$(git submodule status "$sm")" @@ -62,7 +64,7 @@ for sm in $submodules; do echo "WARNING: submodule $sm is out of sync" ;; esac - (cd $sm; git archive --format tar --prefix "$sm/" $smhash) > "$sub_file" + (cd $sm; git archive --format tar --prefix "$sm/" $(tree_ish)) > "$sub_file" test $? -ne 0 && error "failed to archive submodule $sm ($smhash)" tar --concatenate --file "$tar_file" "$sub_file" test $? -ne 0 && error "failed append submodule $sm to $tar_file" From patchwork Wed Jul 17 13:43: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: 169128 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp990168ilk; Wed, 17 Jul 2019 06:44:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7+TZ1PCQ22dpI6d2I1/+Ll4TZDxzKnldu0Z9NrsH5VLRLDyBS677g9QYDaqubRnGknEPX X-Received: by 2002:a17:906:1252:: with SMTP id u18mr30892119eja.13.1563371066057; Wed, 17 Jul 2019 06:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371066; cv=none; d=google.com; s=arc-20160816; b=03rI4a8FblPmlbSDMkNbBwCi4/RyDOEUewNSuAxOVF65p6d+vHlGzbSMD0lxuk7cql YGCwsEl7KTbyi+ofs0VI8PszYYuS/TDK/m/LxiE3oC8NSGTiVX2ZOFDxHDyZeZ6oRovU Zo6wI2ZztiIkpuVibEHvUgUk3w/KczQgODrQkrYdp1mQOK6bTLBTfvsHcL5YVU/42iIb 1SxmSJtn+Ocfkd9Dk3Ct6ny/0kEZsh1ArQ4YZI8W+PqPRVAHvUWaNg4M+1gbJlp9tl5R TuKsJs4nlDQm5aUsYBN7ifCs3F1e4febeHBC4eSUx5IThHKaImb9Bb16fyYApRDew8gs DnFA== 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=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=f4tw77UQXx3eXho/7ivBsQhp7BfL97pip3meIQC/gyEGtxpNhBo1NUWNxdtweM+L2b 8Y8xuRPVHrbUGBViSVDZBSNvTEJxcg2DRRmwiKuRPK79Q8R1sFGZ/axto8/7kqwu+ng9 zpfAwJ87XvOuburRHeI1YyHGVrtK4F5k43s2Ie5U52qg0WKTP+uLp8GMCdOFfnTdU/f/ tjuA/HqMZHjTXAS/vTSj/fCcHZzDLTAwBfsqFjzrZnwVqcsSePeLk2ibUbAJeS6AC0H4 D5KhCamexMKM9PO/an9QixYKLTMEu8tinAAex9u+D6etEgNr5WQ/r4IslkaKPD1LyHio D9Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aWJtlj4w; 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 z31si14740093edz.165.2019.07.17.06.44.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:44:26 -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=aWJtlj4w; 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 ([::1]:57272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEJ-0007eN-Qr for patch@linaro.org; Wed, 17 Jul 2019 09:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55276) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDc-0004w7-Ns for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDb-0004Tr-PI for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDb-0004T2-Go for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:39 -0400 Received: by mail-wr1-x442.google.com with SMTP id x1so9890747wrr.9 for ; Wed, 17 Jul 2019 06:43: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=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=aWJtlj4wopaXjm1M/W/X6lI5ZOzDcPhsm21UqkmhbqGGdlkT5zxWlXXEktCF8uUTPU EAQqEA67mJ1/OhJW7pAvMkDowGJVIUycjD5Adwm+LqUmWPeTpvaEBvrR5jUfT5NNdguy 5oh2elUKX+njaK18MWX2oOWS7erpBlWB2e1MfdxsC3CbxjdVwvxZILBJQi1/s0kjyJFP gJDdD4KtK64sQUty3Cfv8KbLT09jqpyOw93I9mTnK9OqgkenM45jjiXm6zlEolcUyheb cbVwH1+U7TaI8vYolINkZneti8it1kpVjytBO6k1UiiVJZ5uSd0i/wTt2qF4NlQIsOj6 Wpgg== 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=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=RIYEOEYy2NBKUjTYrV90KdMYXPdsT2pGP/aLR5IqJM4xVclOobwP1perNS7+qRmLqL EHi2IRtC1KGRW7M5st2jBxoGRndIA4bsq93iRx13ohW1x4p/sqsHS45wqv8QlfJ6n7ym hgmZYLCSxubH++fdq8anmpzTNnBzAncJfoZykWdP85xXbmafY5WdrSo3RfdgJdKxd5I9 OnL0Ad7KOLxUA3uE/Jg+YDm7YKVsWU1+NF8YUf1gRhc5BDJ0GR6V34H1Gu+W0W54IIIw qERvOXPJpSVYX+64FrYmYoH0mIhsduQ9ZDLaF8DUZi4Jq+CfhFgGrfk5KTXM7HRTUC9d UABw== X-Gm-Message-State: APjAAAXMrIX8OhDyHjXw0kipHMm7yzvvztpeiiY6Y7b63TOHn6hvYCDy XRAkquXebaAqxuv/fH9O4qfboQ== X-Received: by 2002:a5d:6408:: with SMTP id z8mr28264608wru.246.1563371018336; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13sm29073077wrq.62.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0CAA41FF8F; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:14 +0100 Message-Id: <20190717134335.15351-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::442 Subject: [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add yet another test type so we cna quickly exercise the miscellaneous build products of the build system under various docer configurations. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/test-misc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 tests/docker/test-misc -- 2.20.1 diff --git a/tests/docker/test-misc b/tests/docker/test-misc new file mode 100755 index 00000000000..d480afedca7 --- /dev/null +++ b/tests/docker/test-misc @@ -0,0 +1,22 @@ +#!/bin/bash -e +# +# Build the miscellaneous components +# +# Copyright (c) 2019 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +. common.rc + +cd "$BUILD_DIR" + +# build everything else but QEMU +configure_qemu --disable-user --disable-system --enable-docs --enable-tools +build_qemu +install_qemu From patchwork Wed Jul 17 13:43: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: 169129 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp990230ilk; Wed, 17 Jul 2019 06:44:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaed8febyLJVg8gGNfteAwmDkgCTPeSTwAyrZO5l/91NBwF1m9naseMZc3Ly5rRvRqxo1S X-Received: by 2002:a50:c35b:: with SMTP id q27mr35185388edb.98.1563371069212; Wed, 17 Jul 2019 06:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371069; cv=none; d=google.com; s=arc-20160816; b=juf97RJevmTsCpwiebwhZyOAb5ogBsDe5zmVw4wYYvszuyZ1q1PnTAo4Cpoe1g0bm9 q2XK9K4QzTJpmpxJgNhrst6/cyq+9PfZrLVQ94FQZ+kKiMlBaGcaqgJ97EpoL2jxfUaw cMECN3dtSnJIq7dKGyF0ynlfwQIK+giKZT4MZwg9XDAPPTGAVt6ps7hJ51blFdauV9Cr fMXUfZ0ZzTxO5r+ewjLOmpvzwCknynJyyJoxs+5rg047LSBXOShUvMN6afJheccIZa8o VMltV8RaYpcFAZhMO8MeNC+at491vSgnLM8bETzp1N4togkgXQ7hhZGifBkRvuRU3X4a Pp9A== 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=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=kYYikShPpf6fzI2tODTw76oim+zw68uGVsmWfZJkk9OywISve1JWqdk1N0mGv2wZdI dGPnkXVFlgbo6YHC8W73v0DTFsO1YfjPulyfyiAAH+6P7tR9lk+p7rK5zofkjEfR6gKC euZM8GJojuzIqalBgG3nhYwSke9U0PLXDZWEAQ4qCS8Pd/ryWD2OEUAW9ZJhGJ8wk+RB AD/ucEXTQ2f7DGwmdDDarn75PTfEQcQhrwt+pFaINZsfUPF1C9IjpgyIWRY6CDMhU3e0 8NyjBM/88aWt+MT6amuAKyFATwSwPDnO5d07pz7WJWDA8yRTB/n/4Qkq6v3CBWvhK5ih RMyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Y1x8dG4F; 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 q1si8041768ejx.323.2019.07.17.06.44.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:44:29 -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=Y1x8dG4F; 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 ([::1]:57276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEN-0007q1-9f for patch@linaro.org; Wed, 17 Jul 2019 09:44:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55292) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDd-0004wI-CV for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDc-0004UM-9H for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDc-0004TJ-34 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: by mail-wm1-x333.google.com with SMTP id g67so18123181wme.1 for ; Wed, 17 Jul 2019 06:43: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=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=Y1x8dG4Fv0KMiUJaOowH08wZEki84il4YzkGQO1LKdDVdXlAtMWO9RanUtftx02Fpm BotlKmQEsUZfj2HFxUST9R5TvQmZIfUKPrZhW2ayZysK8bJYzkB9QC78Mpr/Lvb1VDW1 8116Bfxdg92hNLVmDjbzD2bLUv9+R8axVzRKFEQuSOYD7hFOdmbqbys+lLi1HNsbCD22 TBo3+sNPqDlSOfDC+A15LGGThq4YBESgR5OaGzvtBz3z8Mzz2fLEKDFmGP2lPVi5DgtD SR+91qpi3iR2WnSSUheQnIqu/+E3muPW7hhnaiRC+vBc7VLCsI/RPpaI8OCGYcQBwmb+ 895g== 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=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=HB2JwMJgjCeFSSLUEFRg6i/0LqstgAdrC9uqVr6QT3evo97nB7nOr4D5SWSyuKHxqP woIb0wpyRGSzqhUpK7GycHa4OH9mp4y9G5/kNB0Ta+/ZP9mIReeMU5s9C4+4kkwCQNpS Xj0H6Can04UjvV9zrbFPeIv12mhbulumkpcN2bpR5aRb4VA0xbifCS0nD924ahUuQa67 g7i1GWRgvaP03ZDSZEO8Q6OE6nyBlCKTwgZF/O1TvZCkGlvWdmOL08zs2Cx2FIApVVQ/ nmVzJN8sAJ2jquL6YW50q7fPx/r+gBwOPPbKKsm2y2aWPzg0CLFRrS/ytz2HH9hpLW8R rupw== X-Gm-Message-State: APjAAAWe1addN2M8xEhm1oGn7Gmu9ZRkkt/YeeZZ18lHG52oHdYnnKVd YCwvoQuuIkxM3Y0BwjcZNwDbZyGwBmM= X-Received: by 2002:a1c:6555:: with SMTP id z82mr37948391wmb.129.1563371018810; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c1sm46381749wrh.1.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 233191FF90; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:15 +0100 Message-Id: <20190717134335.15351-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::333 Subject: [Qemu-devel] [PATCH v2 03/23] tests/docker: Install Sphinx in the Ubuntu images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since commit 5f71eac06e the Sphinx tool is required to build the rST documentation. This fixes: $ ./configure --enable-docs ERROR: User requested feature docs configure was not able to find it. Install texinfo, Perl/perl-podlators and python-sphinx Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190711120609.12773-1-philmd@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Stefano Garzarella --- tests/docker/dockerfiles/ubuntu.docker | 1 + tests/docker/dockerfiles/ubuntu1804.docker | 1 + 2 files changed, 2 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index d3b72209c85..2500ec84b6f 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -61,6 +61,7 @@ ENV PACKAGES flex bison \ libxen-dev \ make \ python-yaml \ + python3-sphinx \ sparse \ texinfo \ xfslibs-dev diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 9d80b115009..0bb8088658d 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -48,6 +48,7 @@ ENV PACKAGES flex bison \ libxen-dev \ make \ python-yaml \ + python3-sphinx \ sparse \ texinfo \ xfslibs-dev From patchwork Wed Jul 17 13:43: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: 169125 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp989653ilk; Wed, 17 Jul 2019 06:43:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzBZdGBpgaQXu3jU1RSN/BSt8XVF9ywLmJ8b/m8vW4Df7/gJrOvzZke3EtfbhW8UPiIbNel X-Received: by 2002:a17:906:c3d0:: with SMTP id cj16mr30890693ejb.96.1563371035052; Wed, 17 Jul 2019 06:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371035; cv=none; d=google.com; s=arc-20160816; b=iZY4uwOdxN/fj7nyWWbLp/Cs3XD9ATANHiQYnmNlA+tKjS19uPsWl04i1Ml1gTNa6E 2p60xAjzHb5YM6w2T8B5tqovmcjeyASJP/D4L6icKZ+xy6QymsG35WJR+/UsCh+BoDsF L4nDyYXkudA3OC1jTPfwgo1oXnHcLRYpNePwkEwz0cvspb+gn27xhC8Hb4LGF0Ly6MZw qkCk8y3PfPYnWko3tr2SK+Dy9zRme75xIypuutFRg560NPCeKPZUYoZhBH30/ZVW5zI/ 8XOCirjzagmgGiBRXMZ3KnEQ7Vippvk6YkFnYelx/a/LrVVS2xq9IIIdAbwvHzvjLxLF ou2A== 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=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=VL/NTTErJMnxbd/CkirQ7RmpI2Jkk77t5Niqsm2Ghx8rsDAqorkmoPM64CQb8YgTqJ fD/otBG61lKrHAAexTbTuNLdH9PU+QSFoI9v30hiAKLjmqD0GMYR2ZeeIKFvlAuj4+Uv rD5zKm4bKo8TCEKcdDF56P7ucx865kXZfu3lPkyS1tXKti6qohfl3DYgHQusuKjlGUkJ Fcuk7B5oPq8d2vreNhnHrG2CI+zhX+IKDXER3T7p1w+GenaFDkUEVAwmcarfTSxlkdWn kjRAWtWxiBuOcy35POR1K9DsC5VEsyB0jHLvlXva66zz8VEqHjfz9TfJvBLnaIaSeQe8 rvBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=POiI6Lg0; 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 o7si10909259ejr.13.2019.07.17.06.43.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:43:55 -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=POiI6Lg0; 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 ([::1]:57258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDp-0005L2-Fd for patch@linaro.org; Wed, 17 Jul 2019 09:43:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55340) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00054i-Bl for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDd-0004V2-65 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDc-0004UJ-VU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: by mail-wm1-x336.google.com with SMTP id w9so19215547wmd.1 for ; Wed, 17 Jul 2019 06:43: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=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=POiI6Lg08KhR63jgO8j8bxe7rhL56Iwz9Gop07AaFbdgsyUYtma2axQoeP6P53YFsZ kSXhDWgzRCt579Qu7q9+0iFghvjWTUQ6er9RRsoV65YNWMmGgNEX/5Mdkp9PfudPMk2w 91XcOY2OM9fZGwCEWRzjxBO2oLvZ+qMwcIPfrV4SdG/45oGlNY3UA+7qhvuqeKknqTtt LUwsHcBBu2QWNYj7ltUmv1AWzxSbiM4JKhKRL9fdV5J7WjqYhDQib7BQ/7oLpsyrtmRg q+Kk/7TVFLYXIcvB9ej8xKaK3ybVPSAQRBoogXeXWv6Q0tzlxjHs3a0JYbmHqgYI3dnl hJ7w== 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=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=VUBFShz3P1+1YJPZJNajT+UOX/MAaCnNQY7epl0y3BsnzNqJoPPnURXCsEFyDlATLz GVmyTJ4alt43Q54mbVVJ9W8UVDGDbMuTkMjwuIOwam51OHAumY83o6prrv9R1C9nlRFi RTl9vCxBJ8G4n9sWQcf6JkeLDwS0/x6Gl9SuzA0C4y4mrGpi9DVzPPswNMzQJMKRWkYM G4+27Qhfs4+mBDDDmeKbO796R5PyX+YWkADRNR7sjv+e7Af4tpPVd1zTOJWJ+mDom7nz 7JfEpEjL2WjqtzNs2QDoTysCp7ILmGPZVUc5DcweymkfV7QY7JFrdKNGtkKlRbHES/xn DbmA== X-Gm-Message-State: APjAAAUoHS3VMyGxgCah9nqmCHJykrYRD/2XjSNpBE8VzzkKYpuCnKuL tqQ6PFkipkT2j65JnOQc2e0W5A== X-Received: by 2002:a7b:c313:: with SMTP id k19mr35434413wmj.2.1563371019739; Wed, 17 Jul 2019 06:43:39 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10sm18954123wrt.49.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 38EA11FF91; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:16 +0100 Message-Id: <20190717134335.15351-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Fam Zheng , =?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é Since commit 5f71eac06e the Sphinx tool is required to build the rST documentation. This fixes: $ ./configure --enable-docs ERROR: User requested feature docs configure was not able to find it. Install texinfo, Perl/perl-podlators and python-sphinx Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20190711102710.2263-1-philmd@redhat.com> [AJB: also add /usr/libexec/python3-sphinx/ to PATH] Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 619d1b5656d..2350d494d9a 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -76,6 +76,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ + python3-sphinx \ PyYAML \ rdma-core-devel \ SDL2-devel \ @@ -95,4 +96,5 @@ ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +ENV PATH $PATH:/usr/libexec/python3-sphinx/ ENV FEATURES mingw clang pyyaml asan From patchwork Wed Jul 17 13:43: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: 169130 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp990479ilk; Wed, 17 Jul 2019 06:44:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtdMT4FtlbvmBI14A9pfYWNMOlCipTu1SZhaxYBw08NSIYoElSpkLjKkFaCRk9CeACrBkI X-Received: by 2002:a17:906:34d4:: with SMTP id h20mr24335279ejb.4.1563371082607; Wed, 17 Jul 2019 06:44:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371082; cv=none; d=google.com; s=arc-20160816; b=v84o7b2wEcOj0GfwqQSKLNvp3tEkuRb50+4wLFEFBe3cLG6iRGc2kDapvNv+SEqsL7 KyVPHVQiEgsYnoWZ8L6PKoTYeQ+2o+MiolvOk5FNd8GTIj0oDrT+71zM1BtbuVqKUTDW KtAqv6KoJbs/bMZ0DDAsHo0pYLA2J6F9ffTfFb7gGrujcncnPVuWZyL3+wCl4hQGyCD+ kpIPMkiTfFKyIvydO18Tb7oKKoR5x8bKHsyvE5mYxo18gIXuU7UpIMsPRMUi9tjmTH7v 5nvaZSNunxtFJoT8OCOm9liTL6dxpqMrk2fSgusgNUCSpjT8P5x+2al4BfteugoTV4+R PGAg== 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=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=Oz6Yk3dLwZspPVoEqW2LyRS0JXFTnGfWWw8x7KKs/ijnQ7Hb1vbSXC6JXKjWGDhCc5 50NUHLjnTsFyBaA4Nb4BCvSk2Af2YkjHT/Z/W0QO+YSyYB0waAqZeHmR9RDRINtgsEWd qdVQenqN1ZnJDqUlFnhAWPXIHGQ13Yi7DejwgYw4BbejOxeE6n+ADgV2aSaY36ufJ1Rp G/M/U2kelcXCr5LlcmhWPRsKcrvYkZ2yTEprVe0RjE+x21oqcIpUgBu8OIY/4Lk033Eg YkZ2cMp4MnMXSa7nNs9jhR7Tor/gFAGrycXOb4zJQ536l0+iBbcC1uMOmHHIlm42h08v uVPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ArEW43px; 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 g2si568742edn.283.2019.07.17.06.44.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:44:42 -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=ArEW43px; 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 ([::1]:57280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEa-0000QM-Ud for patch@linaro.org; Wed, 17 Jul 2019 09:44:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55356) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00057V-W1 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDd-0004VO-MO for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:37995) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDd-0004Uk-G4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: by mail-wm1-x32c.google.com with SMTP id s15so856249wmj.3 for ; Wed, 17 Jul 2019 06:43: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=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=ArEW43pxywcL9yjnRgBtIv5de7eQmLfLmd0j62mEqdnVjE2KBvY6e4i7r8caGaNICv gjnGCxmlKYRPj+PtHAFqRXFZIZsfLusiuwIgeGriKOzWViWwN7fnLteCLGKQes+aoko1 7+HzFRMX9/RILbZJbWOzKRdk3TJK5inKJSLCiwl+OiguT+yydEwQrb9Tu415MfQSHS+P KM2qyN1Tl8rYU9krBN+eDJYFDegZsTB7B54xU8Mxx7sfXwogTKv4i8rsDIo24Q5zX6fu PZxU6PqhjqdAETkH8dJh6s52OyHuJ4Xhie1NjS4tcBrB4aKc8/6tYkQqAyC1guLj7CHN 9tmQ== 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=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=KKrSwTtBTxmat7kJKF6cMlsWOj6iBEMxya0Dd6tXl2NWdWHoO34007P/vFbO2+IhpI QmUgJd9UM7w727lvkiPMNMaZxqSqEnMdRiXr/DIK/datyr8VojYst2kfgGFiekavugfd umCoPBGDz7QiK96vYHvi0RxTP1GSIlSnosEcGs5EdWNn/q7CrWpyywaggMgncvYWaV1+ Fn7e/Ns6b/j6F6o9pDEhXK9wPbHAQMReR2u0Z1lk1Ttxnw4pstaUNdMVJaIdnZ/kwC8Q yP/7btUi/DJAePOXKiyFW2RJmqIPa0nr3lbAFbyPF13Mq5miFSochD7nGvAwKpRVIUGm PoQA== X-Gm-Message-State: APjAAAUqilRE+u9f9gdBehtzwTfao2qFG1YK09HQ83iwTZEZNWjY475/ 1EPNstE0wn2rJEHq3CrxLwl1bQ8vCx4= X-Received: by 2002:a1c:5602:: with SMTP id k2mr34525660wmb.173.1563371020251; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g19sm41640608wrb.52.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ED6B1FF92; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:17 +0100 Message-Id: <20190717134335.15351-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 05/23] tests/docker: Install Ubuntu images noninteractively X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Fam Zheng , =?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é We correctly use the DEBIAN_FRONTEND environment variable on the Debian images, but forgot the Ubuntu ones are based on it. Since building docker images is not interactive, we need to inform the APT tools about it using the DEBIAN_FRONTEND environment variable (we already use it on our Debian images). This fixes: $ make docker-image-ubuntu V=1 [...] Setting up tzdata (2019b-0ubuntu0.19.04) ... debconf: unable to initialize frontend: Dialog debconf: (TERM is not set, so the dialog frontend is not usable.) debconf: falling back to frontend: Readline Configuring tzdata ------------------ Please select the geographic area in which you live. Subsequent configuration questions will narrow this down by presenting a list of cities, representing the time zones in which they are located. 1. Africa 4. Australia 7. Atlantic 10. Pacific 13. Etc 2. America 5. Arctic 8. Europe 11. SystemV 3. Antarctica 6. Asia 9. Indian 12. US Geographic area: 12 [HANG] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20190711124805.26476-1-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 2500ec84b6f..a4f601395c8 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -66,6 +66,6 @@ ENV PACKAGES flex bison \ texinfo \ xfslibs-dev RUN apt-get update && \ - apt-get -y install $PACKAGES + DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml sdl2 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0bb8088658d..44bbf0f77ae 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -53,6 +53,6 @@ ENV PACKAGES flex bison \ texinfo \ xfslibs-dev RUN apt-get update && \ - apt-get -y install $PACKAGES + DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml sdl2 From patchwork Wed Jul 17 13:43: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: 169131 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp990998ilk; Wed, 17 Jul 2019 06:45:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqzwOh430JoieyZid0u5Dq79C7fU9No4bMzW13W3xEoR6DybkgC3Y2gxeoiWllgb8LJGRJIj X-Received: by 2002:a17:906:684e:: with SMTP id a14mr31476862ejs.156.1563371111689; Wed, 17 Jul 2019 06:45:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371111; cv=none; d=google.com; s=arc-20160816; b=YeG+FSEQq7Hg8UXksmHjpEpSfMvaeZpFWFZwgjCmrmP1Unr3G2Y6GGljgp2/nBgzyC TizEQSRyhCgWO4arHn1PdJfBpWNiY21fxiM4JnHpFs9SMZdUd/s/47U1JCwBwSS4lfLH 8DFBWtctrWqlH0XPbVziHIt3FiRfJlA4u198LZQ/Bcq290H+BXbfSzBmWyJ7mkijiGOU qo0HrNYUCFuJEckKyXu73qX7ZknEtsVHRFN/XtyjaJgcVx8eoCALkOxsA0wHM2UrswU2 YaOXuOCN/t24KKNHmR+K/Y+9AP5tHV2UqnuVRtVY5+2vIR7c9eYnkAFfFDqQOAQdUNdD U/0g== 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=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=edvqbErqA1c0plAKu8HB3nmBFmr+E6OhdM9dqets4lmERKRJ5OYlRsPDK7OgaiW+6l wK1l97841T2O2kGmQrdFb+BohSo6ua+4mmYELHbnSFYOyFKJ3pOCr4UnJhRBDrvf5vwh /3B3oiHJwsj69La3D8mSfDQB7quiDuoevV25oEWPNKK0c2PD6/8AWxxQEVU/MEnh8X+y UZ1atgQ31LMGH5O/NgK8pytiP2BqJdwtSiXQr6bt9Pw381o4eoJRzE40v1Mj0+t7nEgp wNNrIZGvVq2lbme7lDbiGwzzXHjc61pJ3dnYwZfprSeME83bpelt7qNxWPdoBsq56+uV KBDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MJwu6qJg; 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 y16si15090385edb.404.2019.07.17.06.45.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:45:11 -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=MJwu6qJg; 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 ([::1]:57298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkF3-0002JT-7y for patch@linaro.org; Wed, 17 Jul 2019 09:45:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55345) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00055R-H1 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDe-0004Vu-Bz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDe-0004VC-3v for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: by mail-wm1-x342.google.com with SMTP id p74so22209326wme.4 for ; Wed, 17 Jul 2019 06:43:42 -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=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=MJwu6qJgJqg4/4reyh4JQu/jD/L9r9VoL8l96xNyFsbf5CKefgC+WRHRwbRGb/9S/l biwDlVy1AdUORKeVBTY/4jTyBXB0KHMtRXHbdjlDFtIGbximWiShdenkLh4EIYLwxcXx SyOAQ9Zp80W6NW40rYpH7dxvG/XY0h7vk6Hkweh3RAZWYj5ExEPX98WrO+Tru/SZsws/ K3Am7U+mbt9SYmvonyxyk1PxrdEZ2zVdmo2d+dOwzhJSmtOAcMr3XWWlnRnLpAUGxUDa lkUm4gC3N+sxfk39b9v1UGqWDmRY2XhMprWp7nYYk7Hamv7tuu1YmotPlKIhdod4jrI1 yoeA== 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=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=qmeMX7RDTFYx2QTm7kFCrxHZ+LE4sE+gR80BAHTfIPYshFvkZybgB2Wcs/vN7ZH0MW 4XKTXXHMUEtAUpFu0UOB+H1vCHR/FD6Tu4Q6ibIyl0OnW+hd0r6qLUljLrA2qrDIL9Sd eA8631VtQwn5foA41oc/v8ecSY8A0w9TxHhe3x9Q9blK9Zs0DnFijMTqC3p3G/UyLrdU +r1D9iqUptuVV2/W7hGPgerZY69tGJEwLqdJYPvHZOs+mzQT2+NdNz2AXST1Xsv1Cruo edb2j+LUmEEbBbCLtdVpzpI9rAyThaBfP2bMU6wqiEzs8k4Mxg4TnDiw4cFhfQegS/+5 QmeQ== X-Gm-Message-State: APjAAAVrhiuPs5QvoqPnHdngCxRe/HpeWorRwVEKoZE2cW3dGWALw3mM DU5rIu4zTv0SyNw/MyCuWNjuRA== X-Received: by 2002:a7b:c1c1:: with SMTP id a1mr38759324wmj.31.1563371020915; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u18sm20148321wmd.19.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 642E81FF93; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:18 +0100 Message-Id: <20190717134335.15351-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 06/23] tests/migration-test: don't spam the logs when we fail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Juan Quintela , "Dr . David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Quite often the information about which test failed is hidden by the wall of repeated failures for each page. Stop outputting the error after 10 bad pages and just summarise the total damage at the end. Signed-off-by: Alex Bennée Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Thomas Huth Reviewed-by: Laurent Vivier --- v2 - bad - 10 --- tests/migration-test.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/tests/migration-test.c b/tests/migration-test.c index a4feb9545d9..c1968740abe 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -308,7 +308,7 @@ static void check_guests_ram(QTestState *who) uint8_t first_byte; uint8_t last_byte; bool hit_edge = false; - bool bad = false; + int bad = 0; qtest_memread(who, start_address, &first_byte, 1); last_byte = first_byte; @@ -327,15 +327,20 @@ static void check_guests_ram(QTestState *who) hit_edge = true; last_byte = b; } else { - fprintf(stderr, "Memory content inconsistency at %x" - " first_byte = %x last_byte = %x current = %x" - " hit_edge = %x\n", - address, first_byte, last_byte, b, hit_edge); - bad = true; + bad++; + if (bad <= 10) { + fprintf(stderr, "Memory content inconsistency at %x" + " first_byte = %x last_byte = %x current = %x" + " hit_edge = %x\n", + address, first_byte, last_byte, b, hit_edge); + } } } } - g_assert_false(bad); + if (bad >= 10) { + fprintf(stderr, "and in another %d pages", bad - 10); + } + g_assert(bad == 0); } static void cleanup(const char *filename) From patchwork Wed Jul 17 13:43: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: 169135 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp992147ilk; Wed, 17 Jul 2019 06:46:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzqu+vIP9DLLVxAORZ5Hs5wH0WY4sAuUB3QJqlutw9JZkHolKL49qoxKrySiv1HjceBG4lF X-Received: by 2002:a50:f98a:: with SMTP id q10mr34937085edn.267.1563371169053; Wed, 17 Jul 2019 06:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371169; cv=none; d=google.com; s=arc-20160816; b=utNYo9mMc5hJS8RjasmdJ1JkinSaOBrV6mlTU4qChtepwHDP0LA/6n9wUc2em0VoqI D9zf6M9DI/Oa9CXQAEYbL9U0W2q1NoJmnvV0iDjuZlpzkV9RD0RQWjj3d0vrsHwWCFaJ ebpHV2TiIhbMXix5b6FymD3u0nKzVcV4skz31VuAGgOJ5etR0C9Ye88kUh0FcyDFyU1J BtAl3QPpMvza6hLbGt0fMj71BS2dgukN9LWHR3ZB4orrOkYYWD6HlulqxPT92D82TZ9J zZzjTrx5jmal/iql8jqsbzEFA/egP16qhR2ILjm/h3XH36QeSXVs12GQYG4qVCMXbPSZ YZ5A== 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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=MaT4ONtQeq1p5xmiDjbn+uFq1OU7d5NPn3pLhCn4TUzjy7/CNHBNHGyJhu6iAPAH0v +RCe4M+KEaXqvtX0/GiEg6jBrD4A5lrS5hzMzpdSfBq6cGOes7AZMPJK2xK+BCcrNfzW xIRpCDPoAwwt+aeED/j4HmKKRyni8j7E4rUTG8cyRWh/w7isUjjuwGyhPXqiP85dumye 4xTn4Sx69yOa5bUgAnNYLbQQgB6JnhPW2xgD2C0K4XFx9sdcHaEvbqTAGUtdhTnlgOd2 OL12tL3iUV7A/avkGkpDLYQ3VP6F+rDOnFKmPz/AeVs2xGQaa9uKIShP9QjCrktkPO8l cBJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=giNs+fTJ; 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 q44si14163775eda.375.2019.07.17.06.46.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:46:09 -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=giNs+fTJ; 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 ([::1]:57334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFz-0005yK-Mn for patch@linaro.org; Wed, 17 Jul 2019 09:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55377) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDg-0005AP-O3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDe-0004Wo-VU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDe-0004Vj-P5 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x4so24867060wrt.6 for ; Wed, 17 Jul 2019 06:43:42 -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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=giNs+fTJqu459Ra85k3rt+TwVJfpMwbneEuiXNGDpEjbfJV3MQDrS0+UJ7rPfSzoQi izJyE3+knowWEAZOcvIRl0yuzQvBjCskG3BeA8M9PnWNXCo7Xq0IvGfk+R0JuROw5EbP JnVELzoUJCMHZOBXM/6a6FNUjp0rUVqNUw+gB0tN1qdZPqWDrlEWze0dp6nrhxsXY0d1 LU9bs2PoaGVeiDA8yoNZe5MfzPTdrGhVG9E4lgOh9uW9Usts7uGnNuj/DMHdjT7xm0Y9 nD9U8txRTRvSen4kej8/u4mvPNuqw6kPnmqiX4qyadV4R0LuzD9v5W6B4/VagV+Iz0g3 4Irg== 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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=Av7MPvhZnwMozIA1x00OFONbnsc+PRllxRiXPEaicDqQ1tjRcpS+gdarASmN+6gHC8 oa9wPxRzrzrKdCeVraYqOogKZQCWOUlfgyVSdorQVRKTWy6HZp2v5EsZEzygQheDEzha /NN0JNFArO111nJvxZ9dHWSakG3Ksbbvg5jazFEs+Xv2l817x350Q75pngxK1mlHjdxg ZVNEhQ5kT6PkpBOdS2ALnZuUkNCotdn36DAFifTxfaVXmZsVrim8Io1rrYNTe6xl90fT fyYXTVz19PwLwWquvrrtZpR1uHijqhn2+zK3+8wHsOYgMTtgOiMaVXNOmjT25PvxYsIl zvpQ== X-Gm-Message-State: APjAAAV2HH5jGZAB1d73gJ0rNJ41/MczG3QRE0XvNX9+FTPEOsMrD0lp J+OZ9rKlku42zsp3mFedXoG9Ww== X-Received: by 2002:adf:f042:: with SMTP id t2mr42957217wro.139.1563371021579; Wed, 17 Jul 2019 06:43:41 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c3sm27339337wrx.19.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D6EE1FF96; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:19 +0100 Message-Id: <20190717134335.15351-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::42b Subject: [Qemu-devel] [PATCH v2 07/23] tests/dockerfiles: update the win cross builds to stretch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While fixing up pkg.mxe.cc they move the URLs around a bit and dropped Jessie support in favour of Stretch. We also need to update the keys used to verify the packages. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 6 +++--- tests/docker/dockerfiles/debian-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-win64-cross.docker | 4 ++-- .../{debian8-mxe.docker => debian9-mxe.docker} | 11 +++++++---- 4 files changed, 14 insertions(+), 11 deletions(-) rename tests/docker/dockerfiles/{debian8-mxe.docker => debian9-mxe.docker} (56%) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index aaf5396b85d..dbd58e548c1 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -85,7 +85,7 @@ endif # Enforce dependencies for composite images docker-image-debian: docker-image-debian9 -docker-image-debian8-mxe: docker-image-debian8 +docker-image-debian9-mxe: docker-image-debian9 docker-image-debian-amd64: docker-image-debian9 docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9 @@ -96,8 +96,8 @@ docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 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 +docker-image-debian-win32-cross: docker-image-debian9-mxe +docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index 0a4970c0683..c787e432454 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -1,9 +1,9 @@ # # Docker mingw32 cross-compiler target # -# This docker target builds on the debian Jessie MXE base image. +# This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian8-mxe +FROM qemu:debian9-mxe MAINTAINER Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index b27985b1b1f..a7068ed6ac6 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -1,9 +1,9 @@ # # Docker mingw64 cross-compiler target # -# This docker target builds on the debian Jessie MXE base image. +# This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian8-mxe +FROM qemu:debian9-mxe MAINTAINER Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian9-mxe.docker similarity index 56% rename from tests/docker/dockerfiles/debian8-mxe.docker rename to tests/docker/dockerfiles/debian9-mxe.docker index 2df4cc8c5c9..5bc8a6d5c36 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian9-mxe.docker @@ -1,15 +1,18 @@ # # Docker mingw cross-compiler target # -# This docker target builds on the debian Jessie base image. +# This docker target builds on the debian Stretch base image. # -FROM qemu:debian8 +FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends gnupg dirmngr + # Add the foreign architecture we want and install dependencies -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB && \ - echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" > /etc/apt/sources.list.d/mxeapt.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 && \ + echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources.list.d/mxeapt.list RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ From patchwork Wed Jul 17 13:43: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: 169133 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp991411ilk; Wed, 17 Jul 2019 06:45:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMtZxgwZBsnto7LuIOV1sQGvVxFiCg1oVdrG8YcWcNxb3Tbm1GxLjgGYuEz9cFWShCLE1f X-Received: by 2002:a50:b1db:: with SMTP id n27mr35350012edd.62.1563371131496; Wed, 17 Jul 2019 06:45:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371131; cv=none; d=google.com; s=arc-20160816; b=qTgWML6d+a2kj9WtUB7N4tYdc6/C7fbZXJtGTFSZAlJG+eW8TxgXzr7Wfm6TQXAY3w vuGSz8jQ77VOwtZLH/4JEGgPtLpQJEvXTctjqkTXGsyHvDHRpzwlwjaLAEdrvS3EVy06 9F9jB6UrjdXCKoSMKuV4S1s2RC7EM/UaDWrMLVdbAPIIZj94p6/RPJzpH6Ngm7heKXYf mo7DM/byLJyLmqC1B6R6dLY+FISWumdCu2WjK1EHaUdQLr9N1QpsFw5gBebHVDYSx90R Y2QpCSKO53Tsq43JWLSg1HihvKEitU9YIQyPDFSkwwyYiiHTjTxtaRI1AXg7HmJV9M1B Vbzw== 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=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=tWW+C2+YqybGx4obEJdvIONvWK/Kc+A8NC5nZbHfpgoowWyP7QpxPLBc+JgIqUMpUM bfcl6j1F8Iojm7e5zIc/zrOfEnM1yIV3LCRYS2XOaf3NjUlo661l4nMnajiRhjDzgw8T hi1e2kJYCQgzv/sGS4pqQzByaYA8FQASsnq3McafppPoLd5+y8mwzqEqImM0JmXc9jGK e1ONKuo9ppk+3Q3/Q32BNfNCXGUZmu+QTIRtE8jrwNHPUXKK43TkZS+LaLnTXLgvLfCi 4fqTAJRxJPw5N/8CNcfsUXqsS8fXukx5veM7aFHMCZYSJ+FLMwD1ZMFsnxrg0EQsc04E rSmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DNjKcM3e; 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 h11si14683840edh.229.2019.07.17.06.45.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:45:31 -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=DNjKcM3e; 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 ([::1]:57317 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFN-00040E-Tx for patch@linaro.org; Wed, 17 Jul 2019 09:45:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55376) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDg-0005AI-Kt for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDf-0004Xc-I7 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDf-0004Wa-Ay for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: by mail-wr1-x442.google.com with SMTP id p17so24863425wrf.11 for ; Wed, 17 Jul 2019 06:43: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=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=DNjKcM3ehWpslSkLygsS5OXu26seAV70RnFldajuN/vwqcBgFh8e6IB5BCCylmQRLg 0FJG8DGz3sWUPClchgj+mud/ksF3GnqY9804CjQR7iNQyl7x3iB5/4etyUJRmV6Rhvhc AwEr0N+mLeVLV9PEzuqMYWRGzUIhzUeZIkX/5TRvpgd4jmaL5WHn5IkkcoysjcVOongT 5gJ09lGbtt1URiBkBEXVsb0GxdRuJYv++M5xYD+vJNOmwsnz3zIrSrcE2LtdchzrvJRL caah9WhL2JII2t50/vZx4BUadWU9x7wA8EbNsOc0oZUr+pmOWAb5PAyxWin6/3H0FlB2 1zqQ== 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=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=QRqFyY25xaWjWw87V+ACUycqmyPuWJdnQFsmNTgkBRGoaxxa7Ts4XFYWXp1pfmPImA 7cDFp0w9WAYzr7lxmRKa8pTD5wpX+UJTD2Ca1/h0iRjT8GmJnxsM5dczHVRExqQ6unQ8 XZ09yVilLB+lh5OY6IP+0HF+3OF1eLO5A7UltpH90agB03t29CJVv+69+THR6nhZYKDp 226nnk1SuCer4Poh1e5/bWtUHQZ1AJgwlbMwvVSpHjOqlQCnCmdpfIyFzDiKYi9LmR74 LPYhlP0Yidf9oe3S80g4wwEgdZB6gezuTj2YZ9YF1QyP2p6Xb0Uj2mXZLiejqwPGbfeq 7cLQ== X-Gm-Message-State: APjAAAVanq4mDoU0oD1pR0TgWs4Jr70Ffj7V40XB7zAPKE/C/ekOEmdc XbKFsqMkKSTEFiH2jxndlN4y2Q== X-Received: by 2002:a5d:66c5:: with SMTP id k5mr44802271wrw.304.1563371022261; Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k124sm37486274wmk.47.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 91C871FF98; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:20 +0100 Message-Id: <20190717134335.15351-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::442 Subject: [Qemu-devel] [PATCH v2 08/23] shippable: re-enable the windows cross builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The pkg.mxe.cc repo has been restored. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- .shippable.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/.shippable.yml b/.shippable.yml index f2ffef21d11..f74a3de3ffd 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -7,11 +7,10 @@ env: matrix: - IMAGE=debian-amd64 TARGET_LIST=x86_64-softmmu,x86_64-linux-user - # currently disabled as the mxe.cc repos are down - # - IMAGE=debian-win32-cross - # TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu - # - IMAGE=debian-win64-cross - # TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu + - IMAGE=debian-win32-cross + TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu + - IMAGE=debian-win64-cross + TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=debian-armel-cross TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user - IMAGE=debian-armhf-cross From patchwork Wed Jul 17 13:43: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: 169134 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp991793ilk; Wed, 17 Jul 2019 06:45:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzTneKedeaWFlWAEwI7cn/wxNdAcDnCF+l+Yg7n4keA8c8Br4L8TrDzGeYC4xq/lp9VDAKJ X-Received: by 2002:a50:e69a:: with SMTP id z26mr34956043edm.41.1563371151725; Wed, 17 Jul 2019 06:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371151; cv=none; d=google.com; s=arc-20160816; b=nAXGOSG6uKPhlpyaOlh4a2rvALyi+L6mEl4MTawH4ixqZxDySUADojiJig10sQvBIQ e9pOOT4V+KBOKmfJ09Gj9/P8RRLH+ka2m3JGStT7QC1xAIqG6pSfYLyRrz2a7M4uIVsF tzrvM9auu2C2YsvmyO/COHBJ5ZQdKlJk/k3ZT2278+GVZRW3bvAba97yNOgN2DPqmY1w j+sArzPHgawXUxNk4CztAfq+mZ18mkCdggb6sxSqHaCPlfEViTNboH+/Sw4HMhLSgk52 +SJSCqQZlzX43ONqi1CHEgn/Xxyppecqf4dBbhhl9mqnQXeNuG2LgyMhAkFZB6BNGyXB f+uw== 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=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=uqBgFq3daAlxGQRT/jiXLyKJzzfADAOJVNu2RfquscRTy4rdZ8pitgQVtHuPbQejTy vc3BKucyFxc6pbVtpuNBhols9QTmwjSzgvJunYTYLRQpMRGs/nLn9Hljler9JZcwXYfv s9qw5PhrTSqem7/jKQJuixO5aJPeZ4vgdWNjQlUoskDtusOy+1rbep1YqAHsPOzZQXyx u6ycEAwgJMtBJYhPcSrVNFXo3oBmfqlZ8r4rBAoJOd6dsX++mXOaWJOnTMC8vo+y507K ax8GjkgDb9TliiJZmiFhCb6CuQoF5K2hXvr9kZRfHlwx3z9UY8kbdPFhrmPLwegdTK+a pkCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bs7r1z3R; 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 89si13732481edq.57.2019.07.17.06.45.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:45: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=Bs7r1z3R; 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 ([::1]:57325 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFi-0004mj-A0 for patch@linaro.org; Wed, 17 Jul 2019 09:45:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55422) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDj-0005OV-Sg for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDh-0004Z2-OJ for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:33672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDh-0004YR-IG for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: by mail-wr1-x431.google.com with SMTP id n9so24957161wru.0 for ; Wed, 17 Jul 2019 06:43: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=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=Bs7r1z3Rc5UITsZbxQTS+0iQdeX09WyNAxV1fwWaJZPr12FWzb/2zJdiSlyiHXGE1F T9QZZFgU0qG6XTBbGVCpaccNItt4tFS7VFmZQxV0qPfSL5bP6exiP40B/Z4aE6laU5Jc zyKqqheFWmJlAmLIbRGYkabo5dD6FYhBzOeYxD+cGFQ34MG+YX1hMkphL9N1SGVY2gMj XyOWnQT9yriRfkSK/ydC+1HNjrx+in2eDgHtQ2tRKD6Wha6mr+TqqsNXXiHfDNMMhU62 DRMlqPzyQDkd3GJTPkOJ+btJqKyHZeuoN3YfFBpkEu15PN0Z3vaFTPOjcYxE1wP5c1k1 QcbA== 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=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=hQysB4o2E2KfnSdR2gNC1tPK3zvGyU49xfYwKvpoHdIw9G5Ls3D0kJXrI1jKvtt9fz RllixDMw/B9r8Qd2UrMxBYestk8ILNapPKJqz8L/mLvyaHW2t2OTGDrZ/khFRPKhY/am dPpqMLM5uXdVp2VJyWxULMk7R5JS2gL4aANvaqgPrFTuDD2ADiYllSUX/XJNfnroXfxB DCA7SiAo8IOrseTtfjc7CXu2X01jhrW1hMaXueeH3wQw/QOaraL4jtOylZSWI8uiOlgK +odDHAcxqv/892kY8mDeGsM5Bx3u807VSYuiMiQArwJXNPkib7y4EPCI0lBU1tEKypDF xMNw== X-Gm-Message-State: APjAAAWxOi+vGsuFvt9yizrBZIwyPHHHmWyhy3fIYd4ojalnqnO9/Hyc jCMJ5/3p/IlASFWX8vUWFr868g== X-Received: by 2002:a5d:4ec1:: with SMTP id s1mr40674373wrv.19.1563371024356; Wed, 17 Jul 2019 06:43:44 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b203sm26458811wmd.41.2019.07.17.06.43.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A883B1FF99; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:21 +0100 Message-Id: <20190717134335.15351-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::431 Subject: [Qemu-devel] [PATCH v2 09/23] tests/docker: Install Sphinx in the Debian images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?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é Since commit 5f71eac06e the Sphinx tool is required to build the rST documentation. This fixes: $ ./configure --enable-docs ERROR: User requested feature docs configure was not able to find it. Install texinfo, Perl/perl-podlators and python-sphinx Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-3-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/debian9.docker | 1 + 2 files changed, 2 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index aeeb151b521..cf57d8218f6 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ pkg-config \ psmisc \ python \ + python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker index 5f23a35404f..52c589a7d64 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ pkg-config \ psmisc \ python \ + python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) From patchwork Wed Jul 17 13:43: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: 169132 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp991224ilk; Wed, 17 Jul 2019 06:45:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqweDopWXBgVNIqUg4gmdFImuMZZIR8LESjUEnxms4aZv86ZZX8OHeICVhlZcrmkdnmuln2S X-Received: by 2002:a50:fb86:: with SMTP id e6mr35014902edq.203.1563371122273; Wed, 17 Jul 2019 06:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371122; cv=none; d=google.com; s=arc-20160816; b=w1ApEWQrex3ES9kLc8pAOZMruXztH/MMio59/N4Fe4/uIHgdLGbp1BqqWXjNFR/ZcJ xVM7Xpl59Tzh+pBC+QAIzbSRVI80kuaSsqN5hTzF5Y9EyBpq+m5xIdQuBBOrlUP/vlfa WimNu6H4CAVOlDqPC7izlv8aJ0+oAFJGZDkUA4b9nbZACG/kfW24Q7cFYzAOpKPmgd87 QaeBmmkNQf7v0CKYIXOF13jxi9A9IpMK/+P6bnXnS/gjmBJjTLmP7NoBdAKZqH5kxGJu 3Iom4CnGOojxLFizn4obVMDIORhHRpuUutPamOsqaX1EYRVjXqDltlaBh/tcKn+M5VLE RjOA== 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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=AeuL9Tso8ilIpw9Db/EjqGhiWpBmMyitKSMEddUqzKVrYIZLX9F41hWif/+czPpjeZ EZadqkI6lhFnlHJ+3NkqSMBhR7DEkA4mtMkgJvoD7AMfILsDbMehXr1hTN1IQqzrrwes tnwuSU8yGfepB8qNZqUHW3TOG0zXHTxxFBqrN2Fp2QkM/IX2ocnv5UXjXdQaZaUWaRhB v7YQWIPPtF6GZPHxISTjhEI7qKijCV1GyduwyQfY4OyQ61cD6nWL1E16/CGG0+ZRwhFs LPBCpAOnzacSzaO9WYkQVewMWqVc8CUReLjdmxOCcaf7lFwXpndrSuHPTkzVM8DoWObB TzHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NkgeUcLd; 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 g53si14045357edc.53.2019.07.17.06.45.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:45:22 -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=NkgeUcLd; 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 ([::1]:57308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFE-0002vW-Qc for patch@linaro.org; Wed, 17 Jul 2019 09:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55414) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDj-0005M8-HO for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDi-0004ZG-3U for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDh-0004Yr-TC for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: by mail-wm1-x336.google.com with SMTP id l2so22244366wmg.0 for ; Wed, 17 Jul 2019 06:43: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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=NkgeUcLd9uUdCX/FyNkApLdMESHm9tNZOxvrWMTdgEISNWBBNkShUayPe5gIRcnGOK hfb61tzDVlPzmL1vZc7D4vi90fksC+1Pbl4vQTVaKdfL9IViE7uqitVj/vhut9vTn8SN PiRaCK3UBvooNDLdAWZzB+IjAa1L2YU8vXmLexKwrnj+7wH/lRpcmIzODgj98nY/GBDO +w5LCsaRMZVm6s7qnLXx2tXKN6KR+7K3GfSwKC4y6OvYk7vI52RWRVQ4oWUScevIaaY0 2cYMqTm5kexrdfMkPOeG79TZ61XgRXKPdSyqzR1Bc652++/PDkRT7rUwPdOehK4PqG9j 7qfw== 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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=RCA+jm/sfQyRycj1+e1Brz5EihB5UqPLvDDu9CR43y1MGQ168nU21dJNIBMofXgWTS e+NBGQofWJGu0PrlmrPa3nZNIK6WfWZ10ONn4RtGG7AQRVhJW6/1ZZC0g8OghFlNMA+R Mp4lCOS7Kd0bgOiqzEBLX65uMaD+Lg7C2MyeYtyXG/5kgre/Q3Sm3F0f6nbkbkEZ1uBi lwgqKG6o77FjWxqrvMxOMsJwXhXhMtzz9GnuDcb04jiqs9xDZmJNfbfURnYoMo1zT9Zs +++r5/htrl0Lt+k+q4Lw9E/iCli34E7pgOUtHSPzTvGfDh9TZZZYjjUNIsAfgWrWHCij vX2g== X-Gm-Message-State: APjAAAW0pnA/Witr+so+ehRAEjVwcuZWav37eJeeo8zmcsxkzxioaaH6 wmYOnTYiOEdx2QQytueYq3U6Gg== X-Received: by 2002:a7b:c0c6:: with SMTP id s6mr39064273wmh.115.1563371024740; Wed, 17 Jul 2019 06:43:44 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7sm23480488wmd.0.2019.07.17.06.43.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF2B31FF9A; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:22 +0100 Message-Id: <20190717134335.15351-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?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é This fixes: $ make installer (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=${i%.exe}; \ arch=${arch#qemu-system-}; \ echo Section \"$arch\" Section_$arch; \ echo SetOutPath \"\$INSTDIR\"; \ echo File \"\${BINDIR}\\$i\"; \ echo SectionEnd; \ done \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ -DCONFIG_DOCUMENTATION="y" \ \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/home/phil/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="4.0.90" \ /home/phil/source/qemu/qemu.nsi /bin/sh: 1: makensis: not found Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed make: *** [qemu-setup-4.0.90.exe] Error 127 Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-4-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ tests/docker/dockerfiles/fedora.docker | 1 + 3 files changed, 7 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index c787e432454..77f5cc45e92 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé ENV TARGET i686 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ mxe-$TARGET-w64-mingw32.shared-lzo \ mxe-$TARGET-w64-mingw32.shared-nettle \ mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-nsis \ mxe-$TARGET-w64-mingw32.shared-pixman \ mxe-$TARGET-w64-mingw32.shared-pkgconf \ mxe-$TARGET-w64-mingw32.shared-pthreads \ diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index a7068ed6ac6..3908c5abc42 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé ENV TARGET x86-64 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ mxe-$TARGET-w64-mingw32.shared-lzo \ mxe-$TARGET-w64-mingw32.shared-nettle \ mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-nsis \ mxe-$TARGET-w64-mingw32.shared-pixman \ mxe-$TARGET-w64-mingw32.shared-pkgconf \ mxe-$TARGET-w64-mingw32.shared-pthreads \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 2350d494d9a..226ac1026fa 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -52,6 +52,7 @@ ENV PACKAGES \ mingw32-libpng \ mingw32-libtasn1 \ mingw32-nettle \ + mingw32-nsis \ mingw32-pixman \ mingw32-pkg-config \ mingw32-SDL2 \ From patchwork Wed Jul 17 13:43: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: 169127 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp989953ilk; Wed, 17 Jul 2019 06:44:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHzs+oCqLa93R3JgeCGXVagolE1CHg4mbNuhqKQyEVh3wkAfmdTIm1wMpdCn3tLZAkESmb X-Received: by 2002:a50:9965:: with SMTP id l34mr36379520edb.152.1563371054727; Wed, 17 Jul 2019 06:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371054; cv=none; d=google.com; s=arc-20160816; b=fU581awGhVw3OcTkdfIwGZKU16eoWGPJDjVwFb4s6yLL+GMKJ6+3t/W1PS9jWRspdT Cp90lnjuS6F166OUO5/GlVbBqLInOnMNZx/9iq/ts1BlSkcKh8xc4wEy1brSViPBwAzL 1rr4rMT/Lz/8iz8mQDpVqLZueUN/hI0wNxhCFpY4zNk5XbMEMdR35kjDaJ3forBhEK/h BK6mciXl2BeSoXWYOF7jQf4l8+8hnpcGOfsHnopAO6pWdsabiDR72mnftKEvzjntKUw1 jsXJlkIXUDuqcxaoQ+jLs43445H9x6aMlwr3TuFsbstDS8yxQ1/og/IReBzdKiJ+iWIc Rx5g== 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=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=gsBmzfDTlXWh5X2Au4rY0Elut//kAL9iaoD7glmalnrrHzCW3180C7ltipYvxszs8/ RiBqgeNzu6DtTDFbpJB5++OA9QHVZsuiIksqtLCDieRCN9zZhEM7ikOr02DUsUVAHmts kcob39Sv3CzwJuqzlmaDmbRr37BTuXSg4Daf11UuLJuvLUPbe7bzidk3e0KZjGocwev2 vOj8JAj2QHhzJiUZw21J9sQsnWLjLl234FCz1579z70R0ihubjWzSmSRDhDMA9Xr+W7N kTRm+zJ9p3LmVPNKbF8moFFlPKJBdx6yVkXzW/cfzndU2NehUSZwVcck0qLv7bI+vZyY XecA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sZgYiQbU; 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 p15si461718eju.348.2019.07.17.06.44.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:44: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=sZgYiQbU; 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 ([::1]:57260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkE8-0005kN-RX for patch@linaro.org; Wed, 17 Jul 2019 09:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55439) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDk-0005RQ-FU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDj-0004Zx-7N for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDj-0004ZR-0s for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: by mail-wr1-x432.google.com with SMTP id p17so24863663wrf.11 for ; Wed, 17 Jul 2019 06:43: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=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=sZgYiQbUfXR5qX9VSd8I1yoHryR7pgYk+5TpCtwbeDutLRkXyGicmElSCx4k2ClZPQ +cqAmfh7hkowjGIhM5yvujBDpUj+qeRKLAWDTNa/AhZXUMN2UCIxcdYmbwMazH8iFj3z 4AmJQdsaX4SAEL4qimcQ/TX5eeytHN5LLW7QYsvSO1bLv7yr0LJj7KVuEpnlF5Xj+Dad ioI3MehAMxi/+lxq9llCss8Urf2NU2wbARhzoE+IjhT1HdrxqbjUJjeDhs2ewvhc1d+y s7N6eTXjou5YjpZz93qKpPpApFkPAnqpOLa8FtZjPCsttvttEpE21b2/EMbTEJDSne2H dGvQ== 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=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=dHADBUVRuUMQCQnY4EjuiSJysgMwPIjPwJJRma1QQukNY5P/tRMTxhnEUbrXsAS4UJ z7tPepAVUIgRi8VqFJ2AF3G8yLhPR+vC1M19Yu65roZ/JtDeZ0lKOFb8VnWx48lm3Mm8 1J5ytbKh2iYJGZHnLsSGqd6VJq6kuhbadXAUZPcJf7QnybLshHYcmUOum75nm/VZRFVM mYgHUrSFJelPpvFADlcT6XIC4UIHUPbi8IpMsaMeM27bdFkY4Sou3h5soCvLMJrJiHBM oH8KVcxxIDadNVKeWpNXMlZZfCGCdTZkKgA2S3WRRFhCr7EiTQ4ooQMPmVDt7NMB1WS5 TBuw== X-Gm-Message-State: APjAAAUYoUsq8mwYqiltyuzMvz/ec/lqDYgybCoioyZdgPbPhHMrj2GV Ys4JGPiibsNaGP0U5l70JzE6cg== X-Received: by 2002:adf:f3d1:: with SMTP id g17mr13868384wrp.38.1563371025858; Wed, 17 Jul 2019 06:43:45 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e5sm25397187wro.41.2019.07.17.06.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D42C41FF9B; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:23 +0100 Message-Id: <20190717134335.15351-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::432 Subject: [Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?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é This silents a bunch of warnings while compiling the Slirp objects: $ make [...] CC slirp/src/tftp.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found CC slirp/src/udp6.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found [...] Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-5-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index 77f5cc45e92..dc74ce7e0e0 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -11,6 +11,9 @@ ENV TARGET i686 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index 3908c5abc42..df7bfce7eab 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -11,6 +11,9 @@ ENV TARGET x86-64 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ From patchwork Wed Jul 17 13:43: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: 169136 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp992508ilk; Wed, 17 Jul 2019 06:46:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHrrSqvYMUGYwnZFEaSxzzHRsY7whIgj/fp0CfK5nMcMTLv02PixRAsB5bMLasAmeCwEMn X-Received: by 2002:a17:906:3d69:: with SMTP id r9mr30308504ejf.28.1563371188425; Wed, 17 Jul 2019 06:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371188; cv=none; d=google.com; s=arc-20160816; b=bLSAnhTe84DtR0fz3RElJEd+iYxQd5Y0krRJDt9FmsP9kaHOty/q5UrrNaEV36iUm3 m3qVc/o4Va0bnzxNGdNvQ73ZKlhoopYZxjwzXWo6Hq4fgF28//y6CPbbxC9gvqQpjdKf E0tLyQYm+pSSQzNEFHL3yrccr1wUim+rYQ+GLn5+CCMzZ0buMNsonI2NzOaYj6cLNyKq uGmUbEbWd/SHmylMWi+OqEJ/4bnE64Ii+zg+Yl12LGUn4FDQX6/OMpADL345lCcrfCPT XI6RLnmg9Li77iGvZVRfmikRWUTX+hrlVsPPvFzPDxyU/de0rYTak9ZmOw/uAkjLkaHZ DEIQ== 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=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=k62QWcCWDZkU0rd1+5Bm2jY23l2fUcUqNZALyHBMX3g1BPovpu1R96+9690Mj0aCQ7 Q98GMXmXJhlhswrnRj6dzLUMOqW6MnQsfWuQQfjFD4FgYJy9yz5OC8DpE4EMM590FhMj mUdmmXx2aNCBhxhPI9li7ND3ttzDdemfIHWqTYXDuyFRB8s/m4vq4v+LfIOTHzmqe0ad GpEn13s/jTHPhf2GA242kR6Z4GQfVtfVgesIUffwkZc0GZlkqcQf9P3YkJgJK7SdSyIk OyKjn+IwsrmOv+2Q2CMT6q8qwCWUOl7XBfnezbtm/1rU2weCWyQJHJT9B0U1Wu7qpInN cRmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W8P5MihM; 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 b12si12850021ejd.385.2019.07.17.06.46.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:46:28 -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=W8P5MihM; 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 ([::1]:57352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkGJ-0007uX-3z for patch@linaro.org; Wed, 17 Jul 2019 09:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55448) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDk-0005Tt-QQ for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDj-0004aP-Pw for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDj-0004Zi-J4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: by mail-wr1-x435.google.com with SMTP id r1so24881109wrl.7 for ; Wed, 17 Jul 2019 06:43: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=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=W8P5MihMKVg7EwSAUqoqo4yRco5P21vQwOT29xToAQv/4unnbgTj3BSliTb6v6fQ27 9JsgQVwafEL62RJ+mpK9S3XKLC80Ifc81z6Erm7IPx2OBP9s/L+f607V8KjZVtlq9qAU CJws0goqduW0XYBh3dOgU7XfOfaUEWatrkjg4NPbLTk5dPFWV6d1NuyZ2y9MtdAeHCLn f7bSHphPEULZ10agW9eTNLt1eWhuWCp5Ck6OvCSInFhr+45hGAIYnCteVBvfO0XqI2oR GP6OEBVEqnLG0JPRKjYNeOiy/sqTkWPhCmB3BbamAu/nIUKUevJNFPzPG7tmaVTzPuLj rVZQ== 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=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=RN6i348ceTVLJ0f/XDtV8hPBNYqTzyvwEoORx5qysw+bQ6WMwk46u/yt11FkR42Yf+ a8CJIPP8lXykWkC2Ms0su5mscN97qIdWaO4//XXe7ayQhh55sC32jZVDMzTskH0aAmGt sCrQxS08jw9oAjAq4cSySiMO7n40HLNmrdcl/YlWhbuUPqOvEaBxVcqoofGWNgeZRnFZ PYsrTHKLh+HFZMrxJCWmTr1wfiUi3nRi7ji4du5fZHJUVz/ejqOaFkt/7RXSJMUB7xVG LVOjGrtERPlYHgQM80E5jbMQGUg0MgzSbyD2jpGHfmNpDPTkgbJh1w4u7cVOJnM4/3Vm g9Ew== X-Gm-Message-State: APjAAAV6BttGFCfy6zeZNuBthgDBErkcYw20KoKrrR4ZeHX7BU1Sxjx5 ZmRGwIWaYVP6B2wne/6i9veE2w== X-Received: by 2002:adf:f601:: with SMTP id t1mr43430852wrp.337.1563371026340; Wed, 17 Jul 2019 06:43:46 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w23sm25040444wmi.45.2019.07.17.06.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EA8DD1FF8C; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:24 +0100 Message-Id: <20190717134335.15351-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::435 Subject: [Qemu-devel] [PATCH v2 12/23] tests/docker: Install texinfo in the Fedora image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?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é The 'makeinfo' is required to generate the documentation from the 'html' Makefile rule (called by 'install-doc'). The NSIS installer uses these files. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-6-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 226ac1026fa..4ddc7dd112a 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -87,6 +87,7 @@ ENV PACKAGES \ systemd-devel \ systemtap-sdt-devel \ tar \ + texinfo \ usbredir-devel \ virglrenderer-devel \ vte291-devel \ From patchwork Wed Jul 17 13:43: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: 169143 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998438ilk; Wed, 17 Jul 2019 06:52:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRXUzBaC5EaX+Q/CnbQ42/c/QPYOYy8VpYI17299AaoQ/+Fgz8GoV+nPkxzKKU92v/OXRS X-Received: by 2002:a17:906:9711:: with SMTP id k17mr31574595ejx.298.1563371524126; Wed, 17 Jul 2019 06:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371524; cv=none; d=google.com; s=arc-20160816; b=gO5DYCijXuSFZ8snEUY+ZRXhXETFu48vkdUlfA7MJRPzOSDuyCbU0QQX6xLw/NHrtG fpzysqL+85/mWoHTTjxmLFQ+Q6PsD8YxK3v+zIxXjenucKXwt8bWTTLvgZShsrVVRwl7 JMc+rL1qAZxtJaE/UGQGWAk9BFd1iu4+w3TdrtsGTWJTUcKaop63981qzpfYOE+7L7VT g46vY5sq6rXA7xkQ81V60vmpggbftOewRbMWHTkdHW8AJNY3Y/doSGsRIaEQ0+bLwq+m nMo2aPZp/nds7zLKClPfT/F8dn9S8wYX8C4MSELWS1DZQSHZy3MJ86nPucceswWWsbPK rcdw== 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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=acEq2tSC0S0F1x89RyYesY/+2e+loUoO8ZMzHm49L+G3Ux2XX70hHGmnT0O8yeSzVW vbk7iAoDtyu4v9/83xULCQ+qB+/LerdXY8cvxsTnYT9jRkddSukWnGob9XTsGimejhzG jdFoWP59pu+G2h6E2woiP9eVhqhyNZZ8A0NFVXDnnpbHvmg7DNwTgnvsBubJ6CvBzndL 2doCoDN24ONsE+I5O+jlT0ksiQ0yWLXA1rhh5+TgIylKdq8h0IzKXl4wWdNC1s4AouFY JOYmJy0duDGJqyuo96Nlw7sfoxLpgQrSyvoaXARBcGZCdQy+g8rkTf085CwNtvtJ+YUF ss7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LloJJfsA; 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 h19si14928986ede.279.2019.07.17.06.52.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:52:04 -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=LloJJfsA; 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 ([::1]:57420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLi-0007v5-Lv for patch@linaro.org; Wed, 17 Jul 2019 09:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57854) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKh-0004dS-Lo for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKg-00014X-OP for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKg-00013V-I6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id v15so22272962wml.0 for ; Wed, 17 Jul 2019 06:50:58 -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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=LloJJfsA9sHBBM7peW5bhux7Tst3iGkBDy1wseASmAmsjI8YrQlcbYR6V1GgA2wPZZ sDvqVIcpdf6KdnZxFESbGTcQe3H15CAZxEhy5trw5RvWYc1CP0Ks8k+Kk69RyHDtd4Xy /FE1GBJmyJP63yHL5ylzgJ+DeRZDUA2ZKwKR/S275pZJnGChziss+WqGCASSiZ1GjmbA ANaH1934Ya5+hmjZ28R5hRmyuVJfhYhFIiOtVnCPepDqkZEfX5wLfy6jB8RjL4T+DR3L VQfFFOXBqj7WHExo7hQwQ3Hx9FOZ2EbGVvp7z8i1035rMaYnTl9EB5IPQ85OpOhbT5K0 EkAA== 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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=WVfJc33blBQInc+WIoBvnyD1spVNJGQgFuS8di7J6/ZPi0ffBVdHwh7ZJkr60els2c nhEMCiiBX1K8xZQh/mWaxwKcLzzcovJuqj0le2TaO80mzvsmCcwWm5XW2EHRcvh9bgbE m1DTaZWOgqNnzwTyIn13QHRgPxe+l02H9nZToq40Rg+0QSqxDG9FymxPgyxJEXRUoHvP 4rciDJEgfbC8lIuYooYEYpqMal/5Al1PDp6uJYaMOB4+iBw7gCxCvmNjqHZjBsK/SGyP O9XKc5Y1B7h+sUvYlfre3G3C28pPrGc71ydC3SmCbxE+gYHImN3P/D7WHPtnWsTGeVt5 SXEw== X-Gm-Message-State: APjAAAWfHnDBTAVqprB+Xmeayx2rXQqCNc1UtOJuRf6N7dLaQTNBBkxT EpPC/uFtoBcLxgrOr03A6XfnSA== X-Received: by 2002:a1c:e0c4:: with SMTP id x187mr35258811wmg.177.1563371457347; Wed, 17 Jul 2019 06:50:57 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10sm18975823wrt.49.2019.07.17.06.50.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0AB451FF9C; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:25 +0100 Message-Id: <20190717134335.15351-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 13/23] buildsys: The NSIS Windows build requires the documentation installed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This fixes: $ make installer [...] (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=${i%.exe}; \ arch=${arch#qemu-system-}; \ echo Section \"$arch\" Section_$arch; \ echo SetOutPath \"\$INSTDIR\"; \ echo File \"\${BINDIR}\\$i\"; \ echo SectionEnd; \ done \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ \ -DCONFIG_GTK="y" \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="4.0.90" \ /source/qemu/qemu.nsi File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=outfile one_file_only) Error in script "/source/qemu/qemu.nsi" on line 173 -- aborting creation process make: *** [Makefile:1080: qemu-setup-4.0.90.exe] Error 1 Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-7-philmd@redhat.com> Signed-off-by: Alex Bennée --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/Makefile b/Makefile index f9791dcb827..5a462629370 100644 --- a/Makefile +++ b/Makefile @@ -1075,7 +1075,7 @@ installer: $(INSTALLER) INSTDIR=/tmp/qemu-nsis -$(INSTALLER): $(SRC_PATH)/qemu.nsi +$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=${INSTDIR} ifdef SIGNCODE (cd ${INSTDIR}; \ From patchwork Wed Jul 17 13:43: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: 169141 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998127ilk; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzmCHip0+Bp9vQP7rQeXahl1jJWie1iwr0FZvMi6dyKcmXWxNGfcnFjr8dN0xioHXRxhR92 X-Received: by 2002:a17:907:20bb:: with SMTP id pw27mr29033419ejb.93.1563371507878; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371507; cv=none; d=google.com; s=arc-20160816; b=aPrzUpVY7Z8BxRHI3sN3p1/GWCP3AM9z6e0hJaK37OWN0uiGnMD5RvaIhW+zCqaRfR L4NpSW/YnWSJi4I31QJhM/XbICbkm4Q27sfprOBmxuv9SFrqt3Rdr3UZhz04+Y3cHsEO EFI6YAtqI2yq3K0Dr7pjyIIANLyvdNYaG304EDUYoPin3gcEADuRTNHNvVWdJ97bJbOh bbTlotYrkOU9Xosuq0YwhcjjugxGxz2FI6SCNEWT/racYEQodeeMaAlROAKCDSgMVR0R u3yxwbcROMcnou1HIjze34F79DHmjR6kWp/iVWmHOhl3nkiemIt4Ir9PXqXmqGMyWyY8 z5rA== 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=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=gy+qtUzHrZHkJDehBlZyEdPOZ01iiJig1K5FumSVKlPgn/JCaW1x68PqmbfemVIl1f 1EjfepjK2KsgW/tlGqZJVa6Ocd05l15+TqEhcv3ETR+aCQSFaCTyxMff6MD5ZeBotvDe amhRLJwHnwHdgvZrZ/MJHWzuNjMwEciXHwKVFp7YI6TEH7NMs7oIOBSO7uoDSbjt+oW5 FrW3534pKbOexE/Yq1Lc2BHoi4Ggg/Hm40cNaRxj21orKH5FK4H+DNYN4VBDvWz80fRd sbx0tCfB1IVQATNN8zfz2GUrXVfZNFZ6VJr9Ti19IPoVlJh5++XQLSP3ItCS4XI+LwHT vW7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AtB0JyaC; 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 d21si12990878ejw.81.2019.07.17.06.51.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51: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=AtB0JyaC; 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 ([::1]:57408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLS-0006aI-Bk for patch@linaro.org; Wed, 17 Jul 2019 09:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57809) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKf-0004XG-J3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKe-00011s-E0 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:53856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKe-00011F-7K for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: by mail-wm1-x336.google.com with SMTP id x15so22257009wmj.3 for ; Wed, 17 Jul 2019 06:50:56 -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=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=AtB0JyaCda6TltsaRVl4uiyveUz/np9FIz9Kkze+bxXbieJz09WCSrmb3sc7pcNpTc 0rm8YGivuX6mfhNTRmy6HVy2tGWAGj6YwWpVYY2ECunl2g1q8Xv2V1xzCTpBgbmLXZK8 HXOqk/e5PCKVp4y1yG7pRI5nsnbpkzoQVyah61X4k3Bcr45LiZwmoJKSanYzhbY/IY7r +o2qYQxw71pfftvEt8mulujnsdA1bhjML4kxSn6Jkt+IOPtKL6PwwpPahYfHEMOK+Lew wITRiG9iBk2J84yakUIbziwbmXNiy6SNR6TJorlr86pXT1nFp3VzdhqikID7wknh57hV smiw== 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=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=fmnAC4A6l6leBqbvczi+iF+VCmm4F6hjLL2QLblbDIMZiCU2dKo0hQdjJwb8OuzqvW Du+vRYRflyVO1y9yCz1A9rYB6DoU6mC5PQSoSaxTkEkBsEtGEXG/jPlH1Nh9cLtNgDH+ /syIwV1ruTZ3y/KiqEzhJXBLwld/JPSDPGnB4V3xJX8p7s7k/S6KvjiMAIa6g6INRjad DF5/XFgZfQzH0tGElNIP4fKzUFxQLF5lZb2w0XOXqMoAqrur56U55+njvtQOyQGW2D83 zcYnAEfMeUdg7FgPzDpmLQ2IPIh52zwOnmANO6IxjmtotcOa2305QHtsid+a4I7ka5qU E/lQ== X-Gm-Message-State: APjAAAU75QMHbkW5i2681+ktlpG54+V5rQ9Db8Rjbx0d0jtGEMbXxJ8F jGJ4X2hZ6O4pjbeaPC7hBJqYZQ== X-Received: by 2002:a1c:cb0a:: with SMTP id b10mr36500299wmg.41.1563371455051; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s2sm20145925wmj.33.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F6BA1FF9D; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:26 +0100 Message-Id: <20190717134335.15351-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The qemu-nsis.bmp file was not listed with the other blobs, thus not installed in the ${BINDIR} location. This fixes: $ make installer [...] (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=${i%.exe}; \ arch=${arch#qemu-system-}; \ echo Section \"$arch\" Section_$arch; \ echo SetOutPath \"\$INSTDIR\"; \ echo File \"\${BINDIR}\\$i\"; \ echo SectionEnd; \ done \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ -DCONFIG_DOCUMENTATION="y" \ \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/home/phil/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="4.0.90" \ /home/phil/source/qemu/qemu.nsi File: "/tmp/qemu-nsis\*.bmp" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=outfile one_file_only) Error in script "/home/phil/source/qemu/qemu.nsi" on line 122 -- aborting creation process Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed make: *** [qemu-setup-4.0.90.exe] Error 1 Fixes: https://bugs.launchpad.net/bugs/1836453 Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-8-philmd@redhat.com> Signed-off-by: Alex Bennée --- Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/Makefile b/Makefile index 5a462629370..f3866ee084c 100644 --- a/Makefile +++ b/Makefile @@ -762,6 +762,7 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ efi-e1000e.rom efi-vmxnet3.rom \ +qemu-nsis.bmp \ bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \ s390-ccw.img s390-netboot.img \ From patchwork Wed Jul 17 13:43: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: 169138 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp997419ilk; Wed, 17 Jul 2019 06:51:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyb2FvGqwg6C3xoxAgb3V6JxDbxXdlJMtwBWOgzLAEtNExTgIlzH/EtRwmcKhs3fh3FFp8K X-Received: by 2002:a50:b60a:: with SMTP id b10mr35104669ede.113.1563371468006; Wed, 17 Jul 2019 06:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371468; cv=none; d=google.com; s=arc-20160816; b=ybG9ZRzrk6xv0fD+nSY0x+zcKDOkQMJB5Z/rNkOEfbvZWBSIqo6Do9HXpKipgqCdaF LFz+/AgyBZ0J1WgJwj1pPlDamZw0dQ8kVv4VwbQyajHtiPy2xp5TIogVoCtUvbuZ5ld2 D9WTVK+0EnRTj94M7Rgh2CJK2iL3A/PJRny92wXQaOVXkgC21RcdbQqjmBOmVLbNrLEJ LDwf9bq/ZJAs2a+lNnUmqZVtluvUzB89pj6kILNMOtDmbJ2IV5FkikxzkadbQi4O9j/O /YcNKgEnGEEzPiJjPW4dH08NO2XREENG/p6l+p+FxuJmUuualFmIzbwy6L43d2jWfx49 QvxA== 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=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=XGW5BlePSsPN879XswNcuZxV7F7Pl675WG93UfTq94eioOV9edXlvo8XrI2yMEJ6r6 5xcZ6BDiNI991zfhn0AEwo7NwGBMH1fGekv3Z8eGD71szj7WJA2xlt0cREl1YW1e8S9u i3ryHykLoqKSF1n/gGjyNASIbdvuRYwZ4uGq3zeaCB1Tifzpi4hHXDlJZ8/tUuwYFY+W rKkAIsFAkId+1Vc7q5WmdvZYFfLDlpT9OFYp5oW17Y+eiT3ILdr09St/lpbtvw8IQqli wwNjTe1+cSXYg3Ov1O+sEuqQ3nwcjjdyDUzrLxdwJXFBMgNJejrdTGXzsb79yc2y/hzX 2eXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c4yK9Snq; 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 k51si15117332eda.111.2019.07.17.06.51.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51:07 -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=c4yK9Snq; 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 ([::1]:57400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKo-0004hP-Hp for patch@linaro.org; Wed, 17 Jul 2019 09:51:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57772) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X3-2k for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00010u-5C for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53853) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKc-00010G-Ue for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wm1-x333.google.com with SMTP id x15so22256943wmj.3 for ; Wed, 17 Jul 2019 06:50:54 -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=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=c4yK9Snq+bARoHabV1ZUkXfsZExH/BB9+KV3esOy6BwiDBFbF0JTXRVkBtbKv+VlgJ MaGf2cDsxfaqzl+ibGevXCb4kW7pQ5oEY0dQM3x0/oBOpyipMG5axPSIEIjST4yYCV7l hshM4Y8nUzUZVeFNIeYgXT44w6PAwwbdbhecR60lC0nyVc0g68eiaoSqtL2VoggKKwpJ xZ1rjAwPHj5xCI/uyPbMeGosMRkA6nlFZQ0to0yVUAucujJV8fe3AVvTwtWlh9IIJAQQ tMqGLuHu8soekVDnKdnl/vgk2xp34aV2yrVHsZjCxPcJ3+VxAcGqyoXF03ooPthaLAV4 r78Q== 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=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=rDKbgz+hFfMd/I681dmXL0elzU8hVD/VRpfOilJpGHKkL4URIf0jbU4aB/xb5zRBXS RH7nol8rvSdp9HDzvBkEUNV/zFLTO/b+SFn5BXOYUjurbrdz4SF+4Bzh9fLU+qTq9pNK huwfKUw/spq2wGYuoD8GZtPK/A1MIdLRLqu2jO+a3GS1NXuDQzfFP674BnE6vkMLmANe lcWy+Hn0u//WVXc2OZC3wktLJQYzhG47aB1snrdO8JFFcr6nOCbQ0e7OLRMhwqJpWrpI c/D7WfZXKtGrRxk6LaNcRMksBjVwqXs+U8VLr2DEl5YeKCqbzWXYkRQ376E5OJ3U8y+7 OYZw== X-Gm-Message-State: APjAAAVNKPYX5gnhTV2AEuzHP79TdNAp6Hpz0ZOxFhBj/5MymyUpG6o4 gUs3s0/tYOVT6la9vOuMUzX1Eg== X-Received: by 2002:a1c:a8c9:: with SMTP id r192mr37999068wme.43.1563371453809; Wed, 17 Jul 2019 06:50:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b8sm22780023wrr.43.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 334221FF9E; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:27 +0100 Message-Id: <20190717134335.15351-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::333 Subject: [Qemu-devel] [PATCH v2 15/23] tests/docker: Let the test-mingw test generate a NSIS installer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?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é The NSIS installer generates an executable suitable to install QEMU on Windows. Suggested-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-9-philmd@redhat.com> [AJB: also --enable-docs in configure step] Signed-off-by: Alex Bennée --- tests/docker/test-mingw | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 4b84cfe120a..fdb1c2c879d 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -27,8 +27,10 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-curl \ --enable-vnc \ --enable-bzip2 \ - --enable-guest-agent + --enable-guest-agent \ + --enable-docs install_qemu + make installer make clean done From patchwork Wed Jul 17 13:43: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: 169144 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998925ilk; Wed, 17 Jul 2019 06:52:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqykPWWvOjhHKZWZbtKyQcOg8TqejDleFxzPJ7s0Om69wq+/AXRUTx4xK0tIyfTBgY0FXvXs X-Received: by 2002:a17:906:6c16:: with SMTP id j22mr31197350ejr.307.1563371552151; Wed, 17 Jul 2019 06:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371552; cv=none; d=google.com; s=arc-20160816; b=JeEFnUBEutySZly98lxq/zsb1ii/c9lQMO88jbLTdacePiR5trr5tKVZx3frtnw4uI Z10uGpLTAXDegtYdzOAa4zNbq3lfBhbfhQi0B+UgvY9G5JiMKlZJI/p6crO7N3VR8ufv pJQG+Wzg0BWFsg3Lp6hPwaaYNT2TL8b4twy5wtSg+OLH7hNA6MX2BfmuP1c9Lg/l6qvF 2S8m26axW/Vm5ciHpx4DJgO6NJIMFXUpjVSDXr1k6qCEUhySOmu+q+iZv6hCXV018KN4 mxnywdw3SCeGR6hMsYozvdBpOM0FBsOJrV4p7amhs2RwacbEgYNsQl26lb0e3FZKQJSy TCPA== 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=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=HILegEi3eIl68/OYahPEyn0x/jFeZ1EKkrsnIZ76sdk8JFK0nLRrCoUUMDTVfNWyDN c2OBsLmU45BaWgUgMR8pRtpwNVZTqvN55NEnzmgakIAeGiuBRI4XGA1KvUNGXH28BnQ1 6xgXqbpmrA2nZK6k4KMzzNrF1QM56GTeUGQA/7GjhPu5JLAkC8Foh/sY4Ow0eBcfsz/W UA5d+1t9O5h4iZyKk6maAuF8efMUaf9lPMLUymDVhgZXMp9N5R+wlgWOF09PZneYzJB8 Tn5Z/7BjEUzxIEgtIX7tpQfU+/FaPlZM97wjR3Y/IAtrVdacbrgFjLU3ZJVxnPDfe4QY 4Jpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oDTxKr4S; 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 13si14634853edz.208.2019.07.17.06.52.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:52: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=oDTxKr4S; 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 ([::1]:57444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMB-0002HT-3O for patch@linaro.org; Wed, 17 Jul 2019 09:52:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57885) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKl-0004pe-Cz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKi-00017I-Tv for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKi-00016B-NI for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id y4so24936979wrm.2 for ; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=oDTxKr4SsJ9/6hNlT8ERZ/E2JFsl7FVBA1crfvK8fkdYMFpjIJRRLJ8EUsh5Ul8+Yi 8L+WB3/ISCZPoqR4I2eTY+QFNOWBN7oY+cCKKGmwhV+z7+sKlL1CLZA1lVqeF45muA+t 2H2+Cxl7R8//L5znZYE850ixNJ8ACPJUoYls3RwN5++AXXZBIWZ424l0XQzoAVRfZi0R YyXQ2mR7hwtm9Gcz+J5F08/AJiXj5XhF1KY+3tIIIm6nynqdNQD4TqsjbOQJlUdPWEFR VBcwKuAC+CPIbXK64CqwWNO5wOPguHD9pv6zM5EmFlB8oGAKFDF4CwuO0vIM9rkfTsyM O0aw== 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=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=OLFActUv73riDEPa5xx6mrBuNNwDZc/iAKZZdwkxE8TkW2rBRHjK2S0PvDppbEk1eF HBmwfR8aL9WuDIN+rpdVzSE38j4QbBSJkAjrvwpwzeYyTGzOzqZI7GMySbjMbsrIx+PY 0kgwsKJU8gwsgjcjPGDUSqwcL+Pb5VVYDXsN1Zn+wWhC8CSm1tuOW9G87mI46cX/KxDp 0J7DaONTeK+MlqdXrBcWa90BbwZ73RSyUeWLTqqMycluIVzBH6+0b1rAzuniHlYr6wLS E0usMv26N8tR7Psi91mgvGw7GrGkU0HrC3JAeJJgIuRRu6f+wZDIc50H2nbTneRyif7J ZBhg== X-Gm-Message-State: APjAAAUvhJEvpiLU71u8bCnArqH95NuNEJKsAsyrrHkSg1iNoLw6CUC2 4wTW/dS2mp8968XdUNsKdslte1YwR4A= X-Received: by 2002:adf:cf0d:: with SMTP id o13mr30711900wrj.291.1563371459713; Wed, 17 Jul 2019 06:50:59 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k17sm24887585wrq.83.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4743F1FF9F; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:28 +0100 Message-Id: <20190717134335.15351-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 16/23] NSIS: Add missing firmware blobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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?= , Stefan Weil Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Various firmwares has been added in the pc-bios/ directory: - CCW (since commit 0c1fecdd523) - Skiboot (since commit bcad45de6a0) - EDK2 (since commit f7fa38b74c3) Since we install qemu-system able to run the architectures targetted by these firmware, include them in the NSIS exe. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-10-philmd@redhat.com> Signed-off-by: Alex Bennée --- qemu.nsi | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1 Acked-by: Laszlo Ersek Reviewed-by: Stefan Weil diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e0..89c7c04f957 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" From patchwork Wed Jul 17 13:43: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: 169139 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp997537ilk; Wed, 17 Jul 2019 06:51:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOFz23dY/I4NXSzBhf9W2t/jGTXPzWRz5Gy6gP6AkB4Q7+4w4bpxekCi/RDplzXrcpFaPv X-Received: by 2002:a17:906:b203:: with SMTP id p3mr30893851ejz.223.1563371474639; Wed, 17 Jul 2019 06:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371474; cv=none; d=google.com; s=arc-20160816; b=sBKmGFISeQNsxDactuib2RCMM6/N3yp6MOEuFKeIp6lyIjFX4Snc+vSwnpeuKm48L6 3/7EGOSmI18UsZeLMKHhGN7UqJoRK2XWmgw0RJSKd7ZsC31M4mDgUkWrnf019OzmRcOV THGCBr2yoqBJAGZ07ucRiNBdbNu8vaPw+PfDfYXHJhFw2/anBieUvZv4bQJ7PcensGkf r2hcGsWMsRdyW6+emraHVdjyeU/BdrsI4KOPz2M1spCF/FEXzeEoSW3TKI/tS8+AgvvO AbycyES3palAUFF37yQB3Uiz9PwTm0K5UJIwpwaMcrS4ku6bzuE84LB4DVj5VOuYYgC/ Ml6g== 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=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=antGWOLocuY5JPnU+YnVcSOeaogUnBA9Za/jK5F2R6AbmAfWFp7xlVoE+EVBKwnd/G tx4z1ApkPHhI+3FEBa0aGfqkkCapPI4p/D8Ks1BxBg8JLQGuKi84SWRP1SRimVXd7uMM oyWWsa/HJ9Wzao3dHj/uC+8LMIsIPQIJmgaEns0FDxuWSxKTZJvPX/cE1YIa/7ROUf1S BnRaHezgZhODg2dkHFygHxWPDTTABhsREf9fR0aSkaDKv+XwlIAiOM5mOWwJdNIgXrJ1 3y8sKkyOVU+MmH10ogM/Jxjv2fXIA9Hey+ePJV0+QhDUaK8mQUqi5mc1tfDuYQ03EQ5x GryA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h0TMBYau; 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 g15si12719922ejm.175.2019.07.17.06.51.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51: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=h0TMBYau; 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 ([::1]:57392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKv-0004XN-8o for patch@linaro.org; Wed, 17 Jul 2019 09:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57773) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X4-2t for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00010l-3c for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:32997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKc-000101-S6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wm1-x344.google.com with SMTP id h19so19232466wme.0 for ; Wed, 17 Jul 2019 06:50:54 -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=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=h0TMBYauQel7RhclqI/KijPgCYbscH7rFEJNoFAhX9/PlG1Ud4STUrLFwWppXuyzkj L66e3Mag2hYO3Q7X5gjdlgz3HEFISkzFTsgn7OYodtN0+01IlMZ28LKU2cl6R0jfzCxU Pn1n+qYaVxf4NAbvjsyslzcYuRuE3ZgIggWgzy2EJSBkmxlUw15RyNnSG3p1QEKHoRKy iVyEOCloon0wMQN+78IBYQrbQIDYcwbMeD/iudED8t1u/AvhASwrigh+bWgL2rCLOdJo 7bLJD2YpaAGVwI3HrrZSFHu0zEiusCJwjE7CeLfYdX1mXVQi/m+QkDdzRgDS3vliYiG8 vCPw== 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=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=N/L3j6cDpO4HyuR8j7d/fMORPUuEpafobISEk4BWVJLiOv47n7QwzQ2wILA842NMiA v7Q4ENrNZc1MzrPmhwIvReBMM9I0bGznHaVwZTPp8G9dnS8BYd/As7JU3SrVtK1wl5UB w1tt27jv65kfRhp6si8tCyrAwPGbdXJOaWTaE1taxSpQOxchUI633uwpM2dO3WcoZ8R0 LfRZ7ED5WfbkoGGu3tnqOc5aSPDWxwU5FksYnK8UkdLr35uYy6EX4dSuC6XOWUrfDj2Y 1ixyUtPAHR/WDPbDUuGPBLkOxhkRJ9iOYI9YqaSD9mIJ/QOiPQHF7IOKTDSrWl4lJNFP 21fw== X-Gm-Message-State: APjAAAXix53p1hexljezGrgRYxa51eGtlmbeDlLfwa28dt2pUvnIQtL/ 0Gln0zdNxgSqBeX8eubTGNA8lg== X-Received: by 2002:a05:600c:23d2:: with SMTP id p18mr34702879wmb.160.1563371453405; Wed, 17 Jul 2019 06:50:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v18sm24932786wrs.80.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5ADBD1FF87; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:29 +0100 Message-Id: <20190717134335.15351-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::344 Subject: [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Commit 97fd1ea8c1 broke the build for --without-default-devices as VMMOUSE depends on VMPORT. Fixes: 97fd1ea8c1 Signed-off-by: Alex Bennée --- hw/i386/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index b9c96ac361e..6350438036f 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -52,6 +52,7 @@ config I440FX bool imply E1000_PCI imply VMPORT + imply VMMOUSE select PC_PCI select PC_ACPI select ACPI_SMBUS @@ -59,7 +60,6 @@ config I440FX select IDE_PIIX select DIMM select SMBIOS - select VMMOUSE select FW_CFG_DMA config ISAPC @@ -78,6 +78,7 @@ config Q35 imply AMD_IOMMU imply E1000E_PCI_EXPRESS imply VMPORT + imply VMMOUSE select PC_PCI select PC_ACPI select PCI_EXPRESS_Q35 @@ -85,7 +86,6 @@ config Q35 select AHCI_ICH9 select DIMM select SMBIOS - select VMMOUSE select FW_CFG_DMA config VTD From patchwork Wed Jul 17 13:43: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: 169137 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp997388ilk; Wed, 17 Jul 2019 06:51:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyWHmB6OUx0iPbYN98VTWqF1hRnGPZNI6Y+pi18A0k5Si/3iCXvXDDZ5QgIOYo1nMggS8mA X-Received: by 2002:a50:9168:: with SMTP id f37mr35480394eda.242.1563371466570; Wed, 17 Jul 2019 06:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371466; cv=none; d=google.com; s=arc-20160816; b=rgE2EEfI8Esn1yB4fPla7coZhnVi77m9bZx5YxPiIeiuUVaYlHQyOYT7KkR/zbGwMZ 62SebKeuC+3vIdIhvx4Q9TGG05m56MQKWBdyeLLyahQZW9Apwdt5hyl21H9nFYksB6ZX qb9C3Ggqfa5nyfAfudbxi4QD333kVFTexnXu0o2pgsF7sTtxEzGs5ry1XtKrIJyiy+7+ YyjzgX5AUElqihGF6IZi/Ur51MXfSxtvCcfQXu/v+BN44ecLE1VnAGsYzR5XWAtNB5JK QywvszO7BdgB60X0RrnhbQJ7xqTtGBXom9yieW2P0R+JiJkj9YKrZzlvYBE4B7KQeUry 8SEg== 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=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=FjHHzWEd3ny2LpR1R3i7KJ3RHdLXdUJ0bL8cZC1JJ1/V4ldiS26Qk5mXtRcysETLN0 /cyLHfQOJMYyV1/zw9VuqOzRFcj2p759zkAnS1SWHJ2lINk+1KCLjYISJlp76gf1x8Yv VjxAvCsHkw7oTuODRLBAGABDJfaU4WGZXHJe/Uaw1VlxCF/1/UO8if/FmQ8e18WKVved oU5cqbzjmF0shcBADyiqymCuiNxMdLcTi1PYYiX3GOZis3Ht7kBnaiwBIGNGu0W8Sp+d 3AqtYk0hneYbz4Qsc348u1crPFgIV+zm3KUOG8tdh+h2u0quUl50KawGR6ta70YpNUqR IV0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kDTR+aVi; 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 w42si13800899eda.142.2019.07.17.06.51.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51:06 -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=kDTR+aVi; 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 ([::1]:57394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKm-0004c1-Ds for patch@linaro.org; Wed, 17 Jul 2019 09:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57783) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X5-LN for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00011H-J4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKd-00010R-D2 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wr1-x443.google.com with SMTP id g17so24928186wrr.5 for ; Wed, 17 Jul 2019 06:50:55 -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=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=kDTR+aViCx2mpH43V8HBtoVNYAU0/LvhBoJqXKjq14vMwmObqQgyut60TTV/nSKl7c Vo28bKwkhK0TMBVpZTCPp9ZHV+LcEcVHQkaA4sxtZWbdf2oblMwyb7+YdBidR/u5gLYM m73sLy4RbFHaSDhAvxcAfEE/trK1sGogY+y6JIoqNuxWjwunTnWuf35tkGwXurk5k+SC zFchF6DdX0kCFjb2MFmZ9UfTOxofAX0GU5OyVQds+KvBgt+/uAQUDkwi3wrwgrjluGU0 N99wYEZacMJ1bMrSsMkyjoXmXFaDU0nBNKOfkKhnrD5QGDBPvlAk8O+9XMC8sEfK4u1o 1J2A== 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=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=hJqqhEXWojfQSkwdUmnBWUKh0NuOgmAPmMrWnlxE0m/3Jq6iuHeQrBO2AaaMFoUR+U 0hIYcNBirj24hGvjF3YRPrsG0OrhqBdlCh0Vg0ce+3N/G7ZZk6EVBRIRdJDmoKWCER+g 7AUjecsykuVzuAWydmYGwUuWnUjkNmyhuDKEJ+mMrCjh9IIHquq+qS8ALEC4e343YuAB URorGV9MZ7+wNcKbuoYs6M6EiqARx2Nh9s6FCKVeLecTewr/cF/PVkKLrtx6Q6BSIgQV t6Kpo4WVwUb3O7BIxeIOxbn712gmzDc9DqxSqX71qmgu7tWu5Ie1mA18jKowZ2CXMF/P qEPg== X-Gm-Message-State: APjAAAU1ePxuTY5ivbFlPafKX7DGeSWcETn1ewEPvCjsMcFb0McIw+OQ pnGU3KMU4uRcF7yyCh+gUgS0Vg== X-Received: by 2002:adf:e8d0:: with SMTP id k16mr43370382wrn.31.1563371454243; Wed, 17 Jul 2019 06:50:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h8sm24309259wmf.12.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6DEF81FFA3; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:30 +0100 Message-Id: <20190717134335.15351-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 18/23] travis: enable travis_retry for check phase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have some flaky tests and usually the test passes on a retry. Enable travis_retry for the test phase and see if that helps keep things green. Signed-off-by: Alex Bennée --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index 5d3d6ee1d32..caf0a1f8faf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } script: - - make -j3 && ${TEST_CMD} + - make -j3 && travis_retry ${TEST_CMD} matrix: From patchwork Wed Jul 17 13:43: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: 169142 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998278ilk; Wed, 17 Jul 2019 06:51:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxink6hWZ+mROpuhSjuAGcMz0iBYXXOMPyYvU0RsV3zrrSOimWrrlfPZE5eIwfL8FLoqdNc X-Received: by 2002:aa7:c554:: with SMTP id s20mr34217537edr.209.1563371515565; Wed, 17 Jul 2019 06:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371515; cv=none; d=google.com; s=arc-20160816; b=rB/8+yfA+PVw4qK9EsGJUpisqdrKJZYrPIGl/+DGAxpqrPxhW6cOxOXSgbCuvm9jqU KuPSCjqBTlp8svImW4je3ldb9PxddkfHXkbLDMCvqodtNQqT6fr+H/ZpV2aALH/CnXb8 QYdSFXEOFe7G1ktfDvGOLsjTITAuNMwoxcaG1Z/H33+wLyAQ5u9teI+dUKn4r8f3z/gd i4P4Ye5Kva+qgpaiYJmuaRiMssxac+3XuA+KlVwjsX3kl8quuOwFE48e0RMITmyoBfeD EL+TAjhhONXdy3KEqu/aen7PP2EKfUD4KVDoq6J8POcdyQXlmesTCvwG2QOhw2opJNMQ bcsA== 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=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=KPRKViGqvuDZ/jXAuOiaomNYnMt9WIq7ExZ4cq6/ayazYkiUFzBoOB1eHMk9+uODNr MEcs9wsvhLRPSoCdXUEmazVxyjngeenCedyzHnPjDgOGStqfnDpLxMGrf0baHhpVC0zL NEa3M5yAu/PhiQ/GoAFK9O8w/yKD0g9OICLdl7oLyF6i+9lHkgcdhCSaeU9FtLVle+7Y +TnNbVqqWOl7F28hvrRMQC4Flx85zFaWkZ4o5nYNKvZuOzRkFKTMQ6G+sYgJZGYbtZSz SV5edMSxZCgv2VhxQ27H4cXzqWY4hY0QNFtS+DaiaSOOBjWiW24f7TiXB7RK7b+FlC4i oM4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VpcDjBsO; 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 v23si13446237edc.192.2019.07.17.06.51.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51:55 -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=VpcDjBsO; 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 ([::1]:57412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLa-0007Ih-2V for patch@linaro.org; Wed, 17 Jul 2019 09:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57916) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKo-00055b-2u for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKk-0001AO-9K for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:05 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKj-00017Y-P0 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:01 -0400 Received: by mail-wm1-x341.google.com with SMTP id w9so19231456wmd.1 for ; Wed, 17 Jul 2019 06:51:01 -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=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=VpcDjBsOqJYKhdBQLS0DZMi1MYane0Nl3uIxl/o/JZn4y1P7SkMx6ectxStRknUxgo J7kpeAgqeGL+LOuXiPK3X3Thm6qFymgOzeEJoau10yjia7Ss0enaT64jQwnDEtbA//Ak jFl/e2O+l9f024HdjrJBEq36YFZ2Sw43LYWiRA2p+180Maq1a1h9Axwri5365VUSUdLg yoTQ0fNqG3GFg5DaX69TceTjaQciOclP7b38D9VtThYFslmaGxK+H577kRog7xKek0kA ZRyM9bKfdLkk4I0WQoceU7uSx6vW5M+ToGaaN00iMyISJU8udDcwEbfzZNen7TgfOtmi /ZZQ== 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=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=CIbnuKmqNO7H2nVImiC9Eg30qRTdTaWduLHoxGZCgg1wNEqPiDWohT06SZrGp2lkqB xoRwIMqGeJWDJj4Ka1VLjh8w7ksUUoWeh+CYJ5JdxFdL6RTi2ks8vpueo+Q6G3rwBoG5 hiFE/O2ycQX9epvOqDZiyPdq/zQOTvm2xXrDVxIn0MsjCJURlOWA28HnZWmN6l6v6t9O 06q1kuq0C4JRWc2zdicoyuE8xSYYvUC7ct7UWkbU2N5IMxKtB7/77ItsPZ2DW1BstTk5 6vevOMKU7wp5ZXjRQz4sier7FiVlHneLRU+WFz2sXSLOKuwbmSfHI5za9nV1oP4YgQT3 ozwA== X-Gm-Message-State: APjAAAUomd5ihVaXTfGVUyq1uRDOYGYx/7Zj08sD5rFFM/Lq1P+S372J pYmnZMdB4Xvh22oh3t9ZKWee2A== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr37937523wmm.153.1563371460558; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y12sm2959416wru.30.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 807561FFA5; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:31 +0100 Message-Id: <20190717134335.15351-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::341 Subject: [Qemu-devel] [PATCH v2 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It's very confusing when things work in the debug shell because the environment is different from what the test is running. Fix this by ensuring we only have the inherited environment from the run shell. Signed-off-by: Alex Bennée --- tests/docker/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/run b/tests/docker/run index 7aebf4b5698..1014871fec0 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -62,7 +62,7 @@ echo "* Prepared to run command:" echo " $CMD" echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort" echo -$SHELL +$SHELL --noprofile --norc if "$CMD"; then exit 0 @@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then echo "* Hit Ctrl-D to exit" echo # Force error after shell exits - $SHELL && exit 1 + $SHELL --noprofile --norc && exit 1 else exit 1 fi From patchwork Wed Jul 17 13:43:32 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: 169140 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998123ilk; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzkvYI8SDl6G3DKZH1hlGfiofGjtLFUCB2zt1jWWtfy+VTWvJZhltg2d9TCaYrF/q2fhw4 X-Received: by 2002:a50:ac07:: with SMTP id v7mr35063652edc.205.1563371507795; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371507; cv=none; d=google.com; s=arc-20160816; b=EcpsPKA50EISTZKvNqUniRMmgMlAEwhyZKOGQqkgKoQ0sbxac6Hx26bTcMW5Bka0KT 51hY2HrsVtdJW4qiW9oJj24e98RukkV6HTRPmJ0V5snvjBo0WCyO+zWvZAi8nEzAVHn9 KFVvQJdb3k8U9E1fRBHdKFRKq4apoGihmb1NpC/yG54ekNc2Pmbgds6lNY35biZ51a6V 568O3++LbWdyJzteXG8jOiIdCv2PyR67TdweUTMio5ug9ret+1w5xM1dqgNuZPO/s3nm en+L/6hTk8787L2ANR8l24BNWwokTUoaTlZ3jVqmiKB0/vHOZU/s425EoPuqxVCEXO3v 85fQ== 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=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=S1VBTPB2r3lf/IgqApcxoPtcgFwpk5XmOvk0KWP8Kpy/O12zDr/Gn6dxKQ/jTvZ/8Y HqtzB0m0/jTdk0JqOhv61p8CdpJ8dh/aXJXxD2nkEYhdZrlGOvGEvitXN7TM3r2FECal xT16y3V+qr4mp9WwA78kwVqyEH7qTpPlNxVk97hncbnTbwQzNlP/bpIEP3YmnKuBNMwd q0kGVIundZd9M3xB00mh1tNqgTFIepMMgFmO1wS/hJlfWdJ17Jon9G3a3x8nibd0EZ0/ nFvsuIxkFEt9nVskusR0DL7EA0rBGE6fzA92bGe0kU4xqdog2TAtSNU/lnblWZMbqlYk V26A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SuUiua8F; 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 gf13si12111602ejb.228.2019.07.17.06.51.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51: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=SuUiua8F; 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 ([::1]:57416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLS-0007WN-7F for patch@linaro.org; Wed, 17 Jul 2019 09:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57820) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKg-0004XM-5D for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKf-00012e-6n for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKe-00011l-Vr for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: by mail-wr1-x42f.google.com with SMTP id 31so24964562wrm.1 for ; Wed, 17 Jul 2019 06:50:56 -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=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=SuUiua8FgyBDal1XtjZN522lafFOH+OattI6ZNjg/Hvfmu5sl0VHqX+PF+1haPCc/m sXQy4tv7IXnhygMNpdIc02smwP2otyqT3v79mm8vaXo8YrYRhdXAMXzRFWHbcPVIjP5U GYyphmMaSAeFMUWXWpYASOCa7mFDy4RlcDNECxn72IZfmNQ4Ihjxf3AC7gu2TkseQDPz 88q9eT8UMBLfmN9cHeFr85kvaqpqTk5UQO+FUVmOeWlfRsceDC3tH4ndtf7FFeP4dl4W wygDokojP4ntMDAF+653qEC+cpCtlXvNFmedhWXBHyKFnFhlVdWiqk/r5/L2+ljWY0V2 wu+A== 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=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=WYDfqp/Zq+QOpJZ3BzDU4X3a8svL403qZnE25+ANXpXCX8RJEIbbiZIaG8J6DlrM0C w6j1YwHXPF6y8V8vVuGZwXKpsm0LviZ1gOrzkWmm8LeZUgCHGcdo0WnIO8r0M+179+It feTT1RoBLaOTougpgXxI2X1+aPmimUJdALma9Dq/QHv1LVGXhwM2NseWk8rVY3JVenvR g00pOEJOQ6MQoBRpJW/Gkv43X2+BdbVwNoKfxmwkkeW8XxU3YexzEOg6WUfJ39rYDAed L5ufOIfI6cYNnlVGGCVVYYvglI3KJVzhCEGWAcdccjnWt3eSDJjm8CiGqrdiCeyWhHWK WTVA== X-Gm-Message-State: APjAAAWkXZ9hWYDYbFI47E+cEIH5vYfm9WyHWSGBhepHCodmCVZ+SJHP IYBhlRHmciM7UiTryVCyDkra9A== X-Received: by 2002:a5d:4108:: with SMTP id l8mr42603309wrp.113.1563371455854; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c6sm22425483wma.25.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9343D1FFA6; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:32 +0100 Message-Id: <20190717134335.15351-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::42f Subject: [Qemu-devel] [PATCH v2 20/23] tests/qemu-iotests/check: Allow tests without groups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The regular expressions in the "check" script currently expect that there is always a space after the test number in the group file, so you can't have a test in there without a group unless the line still ends with a space - which is quite error prone since some editors might remove spaces at the end of lines automatically. Thus let's fix the regular expressions so that it is also possible to have lines with one test number only in the group file. Suggested-by: Max Reitz Reviewed-by: Alex Bennée Reviewed-by: Max Reitz Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-2-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index f925606cc52..c24874ff4aa 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -488,7 +488,7 @@ testlist options BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ | while read id do - if grep -s "^$id " "$source_iotests/group" >/dev/null + if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null then # in group file ... OK echo $id >>$tmp.list @@ -547,7 +547,7 @@ else touch $tmp.list else # no test numbers, do everything from group file - sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list fi fi From patchwork Wed Jul 17 13:43:33 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: 169147 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp999750ilk; Wed, 17 Jul 2019 06:53:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFB6sZw0HEkQjLbCw2k2x+frgeFxQ8ZPfoZZKGapgmd3oDe2jVvLhmZNVZmUeR0aMMpqgK X-Received: by 2002:a50:a943:: with SMTP id m3mr34341865edc.190.1563371598299; Wed, 17 Jul 2019 06:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371598; cv=none; d=google.com; s=arc-20160816; b=v0OvKceN4a1IDuty5xXP9qvMxhOjTcgern4WahvAvjb/+rK8QvxjX0QRsgqM09ohPY RGLd1cCcoCHfguqOqYEu0ne35RQOA4Zh/+Us4kWVNMEbs19OuRzIsuZ+nOSl063MxqKA 7AJA45Tyu0xGjLhz50G4NDxhTxuUiViGBEJVyG+kYQjlud+VaNF+TuEkN7MUJVvPzi1D 16kWpeGjpGNF5VJS9Q8rgH0/SbeiGL/DFoOmOlzaj4u3dE21Y0wuol5H9ILot+wL5k1y NoIag1q4mbFNFiuQQhXI0V/5NXcZzGCJL45iJ6tW1GJyqXxjofDgiN2TFL2f7nML7MU1 tzaA== 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=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=BHypBXmcbe6rT6oBRDRp33O3q8eSLiUaJM85YZY8EnSJ+iLlJ7wZfC7adwUSJJSt7y Jfle8x8i1DocYESwt0SSXqNFuvWgkAwoOSkXWkhZLp27xOAqnhUPEm3k3DLo2KWtqJBZ 4QVBhjKiAmfQMrVPiJ0F5TH96xpdatb4iUvMzfE/ySQDI+K3VwoxnHlvLzscHaqWViZ0 IWPRbIutzTn+TDo8NkiJihNA3Z11WkT1gpLfkfXKposhvachd24BuSaTdZDrdOR2HeSf qfANQAGkwCe2SZogpjMtRXzGxutCH5+6rEDEy8SmRd3sh6w70Wfn5tlJcwogbIjwAbTu 2hpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UOImIFE1; 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 c21si3162747ejr.112.2019.07.17.06.53.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:53:18 -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=UOImIFE1; 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 ([::1]:57482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMv-0005y0-8E for patch@linaro.org; Wed, 17 Jul 2019 09:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57920) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKo-00055f-29 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKl-0001Ay-7r for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:05 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35160) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKk-00019H-MV for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:02 -0400 Received: by mail-wm1-x32e.google.com with SMTP id l2so22269321wmg.0 for ; Wed, 17 Jul 2019 06:51:02 -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=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=UOImIFE1i9copiUQ7JsGuIM0m4jn8j/SNuQY2sLPSDGivLvGd91onzY8uHn733HHNX 41s1rhQEwI6HP3zuj5uDnM2GahtYFv5shmyxR/F64wMxH6O71AxHLZZWi8Bl5HoU7Ehr TLYLJ6yaHbDRDAwue9Zx7430ZQyq6fobAtyeUrXM7jODKdsnbjgisW+vhkggZaEcrOW9 KVWScxyjIZSYglaUjmdS3T6kaHdQmthgO9EIQ0mSTsTgPPiho94TCmKzcwm5Dw6urNi3 gOuCuEKQtGjpgZPs952Y4t7MhAXBrlOWRJtXASsgjk2HdXWg13KCNbcyJ+PnU58Glfc4 egvw== 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=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=Unahjun4kh5W6mjANxU8jV+NkN82c4o4m1xJaJbDSmR0BY0e/cR+uZMeO18nJATVld UYpEga4zUJ5hKWJJ+g0I1p1WS54laTAEsNVui1TmngM2pwqgIyK6J6/b5uDFf8NjzDIz FBKlnmJEObJf4j2Tk9K60hMgfe15yI7/gTwKJHXJET3HDp75Ahqbzr4fo08b/o+IdQgb 9gA6WyoFUoeu+bLu4X9Ne6IhO5Fg3BB+UGsNanRhRFUaJQYPh2p/N6tJpruCbNDV60U9 9lo1Y/iawf9b5Ysa1OF7tWdQD7ClYeQET+AUc151ZCH9K+G7CiTs6UfkMua6I6U0Dj2l bwhw== X-Gm-Message-State: APjAAAXQBDiAVIS2tf/NkjsKRX/EmoDjZtYRCUeP3qlfYk7aB3dEtBN+ xeMKrzOXuUza69S0M4E+yqDlQDcKUWM= X-Received: by 2002:a05:600c:20ca:: with SMTP id y10mr6538728wmm.72.1563371461053; Wed, 17 Jul 2019 06:51:01 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f7sm22895318wrv.38.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A86651FFA9; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:33 +0100 Message-Id: <20190717134335.15351-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Remove some more tests from the "auto" group that either have issues in certain environments (like macOS or FreeBSD, or on certain file systems like ZFS or tmpfs), do not work with the qcow2 format, or that are simply taking too much time. Reviewed-by: Max Reitz Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/group | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index b34c8e3c0c6..f13e5f2e234 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -14,7 +14,9 @@ # runnable in any case. That means they should run with every QEMU binary # (also non-x86), with every QEMU configuration (i.e. must not fail if # an optional feature is not compiled in - but reporting a "skip" is ok), -# and work all kind of host filesystems and users (e.g. "nobody" or "root"). +# work at least with the qcow2 file format, work with all kind of host +# filesystems and users (e.g. "nobody" or "root") and must not take too +# much memory and disk space (since CI pipelines tend to fail otherwise). # # @@ -33,8 +35,8 @@ 011 rw auto quick 012 auto quick 013 rw auto -014 rw auto -015 rw snapshot auto +014 rw +015 rw snapshot # 016 was removed, do not reuse 017 rw backing auto quick 018 rw backing auto quick @@ -42,7 +44,7 @@ 020 rw backing auto quick 021 io auto quick 022 rw snapshot auto -023 rw auto +023 rw 024 rw backing auto quick 025 rw auto quick 026 rw blkdbg @@ -78,94 +80,94 @@ 056 rw backing 057 rw 058 rw quick -059 rw auto quick +059 rw quick 060 rw auto quick 061 rw auto 062 rw auto quick 063 rw auto quick -064 rw auto quick +064 rw quick 065 rw quick 066 rw auto quick 067 rw quick 068 rw quick 069 rw auto quick -070 rw auto quick +070 rw quick 071 rw auto quick 072 rw auto quick 073 rw auto quick 074 rw auto quick -075 rw auto quick -076 auto -077 rw auto quick -078 rw auto quick +075 rw quick +076 io +077 rw quick +078 rw quick 079 rw auto 080 rw auto -081 rw auto quick -082 rw auto quick -083 rw auto -084 img auto quick +081 rw quick +082 rw quick +083 rw +084 img quick 085 rw 086 rw auto quick 087 rw quick -088 rw auto quick +088 rw quick 089 rw auto quick 090 rw auto quick -091 rw auto migration -092 rw auto quick +091 rw migration +092 rw quick 093 throttle -094 rw auto quick +094 rw quick 095 rw quick 096 rw quick 097 rw auto backing 098 rw auto backing quick 099 rw auto quick # 100 was removed, do not reuse -101 rw auto quick -102 rw auto quick +101 rw quick +102 rw quick 103 rw auto quick 104 rw auto 105 rw auto quick -106 rw auto quick +106 rw quick 107 rw auto quick 108 rw auto quick -109 rw auto +109 rw 110 rw auto backing quick 111 rw auto quick 112 rw -113 rw auto quick +113 rw quick 114 rw auto quick 115 rw -116 rw auto quick +116 rw quick 117 rw auto 118 rw -119 rw auto quick +119 rw quick 120 rw auto quick 121 rw -122 rw auto -123 rw auto quick +122 rw +123 rw quick 124 rw backing 125 rw 126 rw auto backing 127 rw backing quick -128 rw auto quick +128 rw quick 129 rw quick 130 rw auto quick -131 rw auto quick +131 rw quick 132 rw quick 133 auto quick 134 rw auto quick -135 rw auto +135 rw 136 rw 137 rw auto 138 rw auto quick 139 rw quick 140 rw auto quick 141 rw auto quick -142 auto +142 143 auto quick 144 rw quick 145 quick -146 auto quick +146 quick 147 img 148 rw quick 149 rw sudo @@ -179,23 +181,23 @@ 157 quick 158 rw auto quick 159 rw auto quick -160 rw auto quick +160 rw quick 161 rw auto quick 162 quick 163 rw 165 rw quick 169 rw quick migration 170 rw auto quick -171 rw auto quick +171 rw quick 172 auto -173 rw auto +173 rw 174 auto -175 auto quick +175 quick 176 rw auto backing 177 rw auto quick 178 img 179 rw auto quick -181 rw auto migration +181 rw migration 182 rw quick 183 rw migration 184 rw auto quick @@ -210,62 +212,62 @@ 194 rw migration quick 195 rw auto quick 196 rw quick migration -197 rw auto quick +197 rw quick 198 rw 199 rw migration 200 rw -201 rw auto migration +201 rw migration 202 rw quick 203 rw migration 204 rw quick 205 rw quick 206 rw -207 rw auto +207 rw 208 rw quick 209 rw quick -210 rw auto -211 rw auto quick -212 rw auto quick -213 rw auto quick +210 rw +211 rw quick +212 rw quick +213 rw quick 214 rw auto -215 rw auto quick +215 rw quick 216 rw quick 217 rw auto quick 218 rw quick 219 rw 220 rw auto -221 rw auto quick +221 rw quick 222 rw quick 223 rw quick 224 rw quick -225 rw auto quick +225 rw quick 226 auto quick 227 quick 228 rw quick 229 auto quick -231 auto quick +231 quick 232 quick -233 auto quick +233 quick 234 quick migration 235 quick 236 quick -237 rw auto quick +237 rw quick 238 quick -239 rw auto quick +239 rw quick 240 quick -241 rw auto quick +241 rw quick 242 rw quick -243 rw auto quick +243 rw quick 244 rw auto quick 245 rw 246 rw quick 247 rw quick 248 rw quick 249 rw auto quick -250 rw auto quick +250 rw quick 251 rw auto quick 252 rw auto backing quick -253 rw auto quick -254 rw auto backing quick -255 rw auto quick -256 rw auto quick +253 rw quick +254 rw backing quick +255 rw quick +256 rw quick From patchwork Wed Jul 17 13:43:34 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: 169146 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp999485ilk; Wed, 17 Jul 2019 06:53:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCyUJzTDiExqJuyM0kO7jFwJgju21DMacDqMELh+CtszR73QtMT2e9bX2zIH6WMkQyhNe1 X-Received: by 2002:a17:906:5ad0:: with SMTP id x16mr31644357ejs.23.1563371583855; Wed, 17 Jul 2019 06:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371583; cv=none; d=google.com; s=arc-20160816; b=1DZD7hae5e0PNuddF6VmIaC3o6OPN/WFDSH+d9/eXurpB5u6OdewLis3abqgL629rt Sdy0YrdqRGitBhV6XdF8bqPygRJEdO1EtC6VP6F6htwGGuiM4O59XH2bh2BHpOJTHcRx oM0CHui731jSVUKNny0C1Ilzb7UgCdEtRuLsASQNnALI6AFf45sUKl+uXsyeDImm02+h X5ZA1VKvwmmF8M4XWubUH6u+5/SqoK9+S/KWPP6nd98txhdGiBGLbithMLuyLPP01LTe 6cNpotqF0rjPRYMm5PGJQRpqtTgKWtCy5tN+KBUVIrrxgH7neGvVex42Yk0dDrP3ZBOu hCgw== 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=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=rV4S1ZzEmRKQirxwTIr2EhXlr1pqQq+oaBSnOuusUIXdMAq+uwgUyCzdQX5W4GZf9G xjk8LGFtqYWDDuckxQdjL7uc7PuD+3e5K0yxs9XS/UgZC0LrWUdDxgY6s1K2PLs3XIpV cU5g7ZanmkVzz5E/eJHHVIciH/zuc39unPqEsApImLcQpofuwMZyWa/fPyuH82n4QhRf bcPTByQTUz+wtLXBEwki2L4YY32oaprX3zLzmCxgmnDj/993LWwKEddsKDDKhhd/NZse QyTjThxsOtNiv02PfcnlCQR3V+m5ghLZshcf2VskOgdtSQQGu9XDXNFucXr3NT8m73bq tcww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vfgGfA+0; 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 x18si12062082eji.250.2019.07.17.06.53.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:53: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=vfgGfA+0; 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 ([::1]:57470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMg-0004Uo-LN for patch@linaro.org; Wed, 17 Jul 2019 09:53:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57892) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKl-0004wN-HE for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKi-00016t-Jv for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:02 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKi-00015c-Bz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: by mail-wm1-x343.google.com with SMTP id v15so22273056wml.0 for ; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=vfgGfA+0cUbAZ8WOL5VGfN7Yn+KIvSpudPq/bQyO0Y1foDZrOpJnmE24fG68US1ShK IW9uitMI/Bc0oQW9JltinHJgpNKQh9GRidGwXdZxe0dH8oSDDGpWSoNooEaiDl7tPWNx VqsP/BK0n2IvD+ijPxJzx/i1/1lA3VGTpBPkgKtecJp6EJXFu7+BPffnm9Ti2AMZs7CC ZGIplavUxCxnPXcznEANH3tJn1n86/CRrSlV6Kbq/DSlt6Bx7od+TNzPhJCQtyCSfV6s +1miIL2Zv7IQPv3VU6Emvo9XE81haDkgjok7Av48DrQCMxOaa4VsBFJ5OMY9enYDXXUx iyLg== 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=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=aup7bAYOi8Rsiy41ZAtmvi0ZhRfxfk0gWXk3yliTD70UKlcSvtkRSqpdICqKGpZARH Uquq3bxHXGvyoHjVpKEpX3lGaPByapWtlQ2KE6luHLlKybV1sbMYv9DjfRUYAJGz/g3g hY5+tU99pbq40dQYscrpGgjSig2GW+rt0GPKXVy35AWL/7TaL67NiqzUH74hBh5yYvoi 1UZ1eoCNtNdX4NNmvipzKvroir7CRk2xYptd7V6WNMga1q/VcEHX9GNpuuGFSQ8C38y/ rveDV+UqalSaZjmP+fQqMR9WZDnzF4/tNrkQdtqBybKQbKNgbdXAD+aoZ+75+JvOsjt4 jU7w== X-Gm-Message-State: APjAAAX8w2aG/TqH5vIqwB9K3e7BXen2MyCD72zYZmEi6tISpI2sW6Rx 8y6QIPUDf6u8rLbnhHdU5IgI6s6GOwA= X-Received: by 2002:a1c:f90f:: with SMTP id x15mr35821393wmh.69.1563371459136; Wed, 17 Jul 2019 06:50:59 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 4sm53933619wro.78.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C11881FFAA; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:34 +0100 Message-Id: <20190717134335.15351-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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::343 Subject: [Qemu-devel] [PATCH v2 22/23] tests: Run the iotests during "make check" again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth People often forget to run the iotests before submitting patches or pull requests - this is likely due to the fact that we do not run the tests during our mandatory "make check" tests yet. Now that we've got a proper "auto" group of iotests that should be fine to run in every environment, we can enable the iotests during "make check" again by running the "auto" tests by default from the check-block.sh script. Some cases still need to be checked first, though: iotests need bash and GNU sed (otherwise they fail), and if gprof is enabled, it spoils the output of some test cases causing them to fail. So if we detect that one of the required programs is missing or that gprof is enabled, we still have to skip the iotests to avoid failures. And finally, since we are using check-block.sh now again, this patch also removes the qemu-iotests-quick.sh script since we do not need that anymore (and having two shell wrapper scripts around the block tests seems rather confusing than helpful). Signed-off-by: Thomas Huth [AJB: -makecheck to check-block.sh, move check-block to start and gate it] Signed-off-by: Alex Bennée Message-Id: <20190717111947.30356-4-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/Makefile.include | 10 +++++---- tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- tests/qemu-iotests-quick.sh | 8 ------- 3 files changed, 40 insertions(+), 22 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh -- 2.20.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index fd7fdb86586..6f02dfcc019 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -142,7 +142,7 @@ check-unit-y += tests/test-uuid$(EXESUF) check-unit-y += tests/ptimer-test$(EXESUF) check-unit-y += tests/test-qapi-util$(EXESUF) -check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh +check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. @@ -1092,8 +1092,10 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) -.PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +.PHONY: check-tests/check-block.sh +check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ + qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ + $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y)) @@ -1167,7 +1169,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree +check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) diff --git a/tests/check-block.sh b/tests/check-block.sh index f3d12fd602d..c8b6cec3f68 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -1,24 +1,48 @@ #!/bin/sh -FORMAT_LIST="raw qcow2 qed vmdk vpc" +# Honor the SPEED environment variable, just like we do it for the qtests. +if [ "$SPEED" = "slow" ]; then + format_list="raw qcow2" + group= +elif [ "$SPEED" = "thorough" ]; then + format_list="raw qcow2 qed vmdk vpc" + group= +else + format_list=qcow2 + group="-g auto" +fi + if [ "$#" -ne 0 ]; then - FORMAT_LIST="$@" + format_list="$@" +fi + +if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then + echo "GPROF is enabled ==> Not running the qemu-iotests." + exit 0 fi -export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64" -export QEMU_IMG_PROG="$PWD/qemu-img" -export QEMU_IO_PROG="$PWD/qemu-io" +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then + echo "No qemu-system binary available ==> Not running the qemu-iotests." + exit 0 +fi + +if ! command -v bash >/dev/null 2>&1 ; then + echo "bash not available ==> Not running the qemu-iotests." + exit 0 +fi -if [ ! -x $QEMU_PROG ]; then - echo "'make check-block' requires qemu-system-x86_64" - exit 1 +if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then + if ! command -v gsed >/dev/null 2>&1; then + echo "GNU sed not available ==> Not running the qemu-iotests." + exit 0 + fi fi cd tests/qemu-iotests ret=0 -for FMT in $FORMAT_LIST ; do - ./check -T -nocache -$FMT || ret=1 +for fmt in $format_list ; do + ./check -makecheck -$fmt $group || ret=1 done exit $ret diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh deleted file mode 100755 index 0e554bb9724..00000000000 --- a/tests/qemu-iotests-quick.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -cd tests/qemu-iotests - -ret=0 -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1 - -exit $ret From patchwork Wed Jul 17 13:43:35 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: 169145 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998947ilk; Wed, 17 Jul 2019 06:52:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5Spkx00n+aU3CT3p9qPqKvh7sDl9xPh0/793ta/xP8I1yfwiPIbKXU2bviFBVUR/W+62y X-Received: by 2002:a50:883b:: with SMTP id b56mr34893447edb.178.1563371554102; Wed, 17 Jul 2019 06:52:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371554; cv=none; d=google.com; s=arc-20160816; b=fps8FJRvy4gjJmPR30VAY+pJN6/tmfjjfHQGnmvFqjLx9bKYfymOAuuU+Rn4lWtPu6 dcOKx0YcT/AJ5GL4cg9UiYGDFb0nCGKB88bXpQVTDsi5yyYdn3SH2Qu/wb0SjNeEHdRw 0ZgFtoesFx1d6OwtIgckDJK19CGt3B0sXGeINOW2gowSfcS9+NqyZYBhP03Wut1TmR/L LYon47ibZzq5sRI5cZsrlvp03hx4qHre1QxHcQ6+I0xKg8SZMXvX2GFdK7ovJhbLcGfC nZtTn4I4qU7+IHJ82f7Fl+j0olUgV/8WBe/IUnNaxpz2S16yjr70zdMkmOfWkVCo/Fnp fkxQ== 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=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=eTLHKLRd+h7GamMJNQy1tILpipFVr0SyHmFOXzClxtTaAVzKuICy0KjGFg51vnt5gy 9Y6CPK5vdbLD0uzwc6Aal70mn5pB7Ltmnah1rL0A2a1ykhQVlSUP86YQH02y70FLSPRv w8b9yWgQy/TzWpXboyNHnlXDvVIWpjxKBMbdQI4dsAbFaJXq9RgkpgyBOCdMM3S5Mvtq vK9obK0lPGM1b3vTQfaEETCbBNPyAAf8ZOXfIkzPCGg0TPSDyy5BVDOWp4a7RYk4TNzM 3jOiq3QESx3BSM4aJSF1vFQB9/UWbiiw67Jfvrb//4FdaAWBDQaLk6xfVsOKivtZmvaH vBKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uMHfX8gg; 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 t55si14672343edd.95.2019.07.17.06.52.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:52: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=uMHfX8gg; 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 ([::1]:57446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMC-0002PF-RJ for patch@linaro.org; Wed, 17 Jul 2019 09:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57852) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKh-0004ck-IL for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKg-000147-Cp for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:36902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKg-000133-6a for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id n9so24926654wrr.4 for ; Wed, 17 Jul 2019 06:50:58 -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=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=uMHfX8ggR2y00Q+pn6P234+XW1MxewC/5h9U5RsF4QsKLWwtZpqxg9j6SCztdR4uFt ZxIOFVgR2cFB+RNb+DaDHVYKdGRAgZs58XjmjiKaR25DRnck0I2QfhkpGl/VDGgUgeml UivvAfyqK3a1sE2SjUWv/Td8GrqQkA/LJ7zpNZWTY8cVYRBFplpMdGt2fiZ2BDu3ntr8 d64va9cLeMfx68ZcREi6oTZ/qkqsY3Uhc7C4OA8pOr8ZKfHby4chNT7vrAbWfIPKYON8 raqML6bWgBQ75q0Ph2Bi/dbvlDDCjCJQMWUJazKkVk4R0zTkN4XSExQH/989HXVNNwkM Ht9Q== 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=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=Yi9VfkzVZnl+RluuAXsOqv6b/miQ9BkH0BRhqjPrn6bGEBaTGrz5WLAJNLKlmCbM1K 9ih5A50kqRh+q7fao27M4qpbnE8MhnSIk5CCMYALO7MTmFdQ6gAoAyiGU5XT2/IU1bM/ mU8jAHp1fwJjNVy45pkocoXkYraPjKerWyI4tsJ6bNK4P0firJiN2RIBswHy3QyFi8/u 8+LfU7R13U4MzqkTCSA4Dir1nAPJKINSwzTutTAq/bdHj7tSAqpf7s9KcaAyeYLiHbX/ d/qAC6wtPUed3kO5Hs1OqI4vAd0Ewe9/camnHGU96IdcmCwAvBTTjEKUw2WByelBysW6 iq7A== X-Gm-Message-State: APjAAAU+ONpqgIcgkcABmtZKxcOUOoa2YhAiVWbPKEQ3som3fWQ+UBec 1w8oBqpgOBxqBRfTvArBIeiPoQ== X-Received: by 2002:a5d:4212:: with SMTP id n18mr42140342wrq.261.1563371456935; Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j33sm54337220wre.42.2019.07.17.06.50.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3A5B1FFAB; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:35 +0100 Message-Id: <20190717134335.15351-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Since most iotests are now run during "make check" already, we do not need to test them explicitly from the gitlab-ci.yml script anymore. And while we're at it, add some of the new non-auto tests >= 246 instead. Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-5-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c63bf2f8225..cd4c03372b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,15 +45,10 @@ build-tcg-disabled: - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236 - - ./check -qcow2 001 002 003 004 005 007 008 009 010 011 012 013 017 018 019 - 020 021 022 024 025 027 028 029 031 032 033 034 035 036 037 038 - 039 040 042 043 046 047 048 049 050 051 052 053 054 056 057 058 - 060 061 062 063 065 066 067 068 069 071 072 073 074 079 080 082 - 085 086 089 090 091 095 096 097 098 099 102 103 104 105 107 108 - 110 111 114 117 120 122 124 126 127 129 130 132 133 134 137 138 - 139 140 141 142 143 144 145 147 150 151 152 154 155 156 157 158 - 161 165 170 172 174 176 177 179 184 186 187 190 192 194 195 196 - 197 200 202 203 205 208 209 214 215 216 217 218 222 226 227 229 234 + - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102 + 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194 + 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247 + 248 250 254 255 256 build-user: script: