From patchwork Tue Jul 23 10:35:50 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: 169491 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8702818ilk; Tue, 23 Jul 2019 03:36:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQ6N+NoM1ODhzPxE4NakxR/1AQHgHVzJ8KD92eIQfd/naoDnjaCDe2YMlRD3TjwX5zLDCh X-Received: by 2002:aa7:c0cf:: with SMTP id j15mr65089122edp.138.1563878192690; Tue, 23 Jul 2019 03:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878192; cv=none; d=google.com; s=arc-20160816; b=Gz9qEGOr/HYGJt00yF3cbYeIXGlwwua2lc1+B+unkbY29caXAvnzHL9NUSMYJGZShr 8wkS44kYVVpS5qyJVflmpqNg6D4aLLduaRcqfhBADRRY8xDzmpME8oY3k7sgS95XV6/B pvIxBSkBDMQLmf7dIsdBDpfLJTpbtqiOmASMrN0cZ0Kstm42EPzsqlRLGBBFQMJm2LPx KrSzUfqmUZWEtg9+QmZ/bGJMsxN95dLmi3WkzkJdmhbDRUhM/DSMLbmHkYXvUlJ24LR3 B0m2+7AZeBUsv7hlUKAuhCU0vIFr2i700PFmiq8Y0WGdXDDqcz/CL3p8F/fyCRMVqD1E pOKw== 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=15XBOc0K5qrNi75fMYOmlumdevbJac2m4Bpn4CypPlo=; b=gTR6SY0obx7yZBessvaoJSL4aDSULo1GZsl8OaCo7ZkQ0M2dHcw+9q0Deja1qV0GoM KaoPs0pYNzRYdVSRQzar+uZRcIIwY/WhnyDf6q4UbgccUGePMtBsTwvX91NA6G4JZnkH I3QjHlZI2Ook6pIWmFqe5e/9rP433ato/OLGSV2r/xh2gwlbWZe3UYClo+XA9IxuCNhv Vs8NE+2LhxoD/V0QLOYsKKXlp7vQEY8eIY5Lza2/gjHnfK3m8feAkhtE4kIRkgXEmP4G l/P2MSmXe1HpW+eu2dxhqqF0WXrd+uKexHB+25pDTMWGLIlTOWNbG6MlBfsQErCKu0Z9 wERg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B2DSqrpz; 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 y8si7558580edb.251.2019.07.23.03.36.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:36: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=B2DSqrpz; 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]:40962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9n-0005gd-Ar for patch@linaro.org; Tue, 23 Jul 2019 06:36:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37723) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9Y-0005e2-Nc for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9X-0007Jv-Ig for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:16 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9X-0007JG-A1 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:15 -0400 Received: by mail-wr1-x42a.google.com with SMTP id g17so42618508wrr.5 for ; Tue, 23 Jul 2019 03:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=15XBOc0K5qrNi75fMYOmlumdevbJac2m4Bpn4CypPlo=; b=B2DSqrpzzF0HRMUDsahhhPa6Bolw2/eucsbP25fQ2Yia0RuQkfY9+vJNNzH5gb9929 KlQ5MAEx4kUy/4SlrNBVu+OrLG4JpMQF7XWwMI3dCqf4OcZ13zsfjs+z1Ou8tGZPwpC/ WBggFNrJNODTmexZCvOXtX416sGnGu5SMEAcp4dYq5xehml8Ezs7nRcKZpO9RKImtGdD DbMY5zSky1QUhMML7n+ph/0Vlz2XweuYpJ8l9dw/RCzXRCYw8z0QeEm+PUQ3tHDXzetV 2Oc1UfEobRRd5aKvBwLsqH9CmR4vmafxARNTsICWo87YLtuPlmfwSdr+Kt0Nclo631ep 3rQQ== 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=15XBOc0K5qrNi75fMYOmlumdevbJac2m4Bpn4CypPlo=; b=DhpZ6Oc+jV8Beozl1f1KkaE0prVxop9xOrbWjgVsSVL2+2gEkTN0M5cDr4YYsRbbOm iVLuFHhmk7hRrayYg5GEGTay+DoLTLa+Cdwbpo+lckGMAs7FUZnUr/MgcD8Vuumjo0wy 6yhqr0cXl0oLt2VbQ5Lug/cRPmhiQr4SxluAUI3pu4AWatgEsHykr0lZJjpKN4ent8YR XRRfw//1wwrRoLsRXklfoeE7XydnkCWN2buJ7nuLeR4yftTqlV35RcHQjPkdl7jkp2Vs j2N0+pg0CiOmmg1qHnhxaEQNxJv5DJlIHU+sxttmqbyr2BMIZ6PYaajnVUIOcvC5bZo+ HlFQ== X-Gm-Message-State: APjAAAUhR5HJK+pgCsrI20+KTrv3vXn8uTQqYIpCSRN5tiV1j2P7slyq 1R/mdqxgHHaIlHm0DES/3w1ADg== X-Received: by 2002:a05:6000:1203:: with SMTP id e3mr4909090wrx.300.1563878173575; Tue, 23 Jul 2019 03:36:13 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j6sm62376070wrx.46.2019.07.23.03.36.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7153E1FF8C; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:50 +0100 Message-Id: <20190723103612.5600-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:35:51 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: 169494 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703253ilk; Tue, 23 Jul 2019 03:37:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2oUBL7KaCyYrI7KaWThddlQLVag9RbgxistTckd/bWGr4LKbmHtRtRjTemHs9ltahP0wn X-Received: by 2002:ac8:1bdc:: with SMTP id m28mr54526906qtk.22.1563878220876; Tue, 23 Jul 2019 03:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878220; cv=none; d=google.com; s=arc-20160816; b=gQ1Ik8aH3pWgqjhbSOIgUEuRrkiOIEzaA2ww8voi0OdgmD9VDAdFSZUhQtaBxzHhvl k97vLHG84pHPObstUHskn3toBE+z97HAVw/BXT8tpQO0YYWrfqEsk8xyCbYSOKOlIAVy sdX+x7vXfxAoCLJW1E6jUA9x+oPXzFlzvsWsBs7MXRW/Agi8FusvIl20UKWAO+Gimodz wkqhLiS0x4IuIFCpzgcptpqJ0drs8eHNyN17K8TZrWM7MBbEfEFpmbOJNti/ZcxJX0X3 ZveMxH0/FqOacpAu1DDYcxTlxUaQJcmnfVHdM+9EZsmWEvhAsC5RuMyzRma7Pbrx+oJ+ GEBg== 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=B9rJQfX4dfIeOXpLw4etOZ1Y3ebTwSMBV28SJO0g0Qs=; b=c+PNPGd/2TEKMR3hgz8ZWIJI+GsIN/iKMpnAyfUBdaLWJeSdzKRquqRJco+okHuqIL LmN4Gi1if3L+c+J8QnpyAs61T9CUNev9bSOPECLVM3PQHm42AMRJPTYl70Q3xa9m++8P 7QL6wvRjv3Vugxx34L41e7nijxOwBhC6O3wYfDBTTste4zKp5rYAvi3rsA5cXMTA6k7t 9K1rJ7qDEYivP4Z1KpIK7rlCEibPezzPWSJx0HRCPQ6TVqn8nYewN3R2NaDyhTwXUcAH GtyqKQwpydzcapujyvmUp2PIsW/6Bjkl4PabHQsRyAY27R5z3onQ7FjlZ8hyTAa2YBxx cdAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MEZZm5RD; 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 b19si99201qkc.270.2019.07.23.03.37.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MEZZm5RD; 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]:40988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAG-0008Oc-4s for patch@linaro.org; Tue, 23 Jul 2019 06:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37761) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9a-0005gc-QR for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9Y-0007LG-Ng for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:18 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9Y-0007KG-Ef for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:16 -0400 Received: by mail-wm1-x333.google.com with SMTP id g67so33921453wme.1 for ; Tue, 23 Jul 2019 03:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B9rJQfX4dfIeOXpLw4etOZ1Y3ebTwSMBV28SJO0g0Qs=; b=MEZZm5RDAZYwHHIwchdgk/m8qQZeNYT2vZrG2TE+cizCLVHLZQqih6dKNXdhKaGTae pkG1naK6ALClWdNon2zW80yjMFjxbcIxJezPdSAK324E8ePNGzXyt1ffTrizNRFzU2q4 gmVPUiBEHoEYoNdkizI+wGgb3SIcSs5tuW1lZUHSDQTU82FzkUzXkusw0gHlv+H4vuNL DPSgU9YkoaoonU79YirIAvpgWQawVHOmgKGGgCLStRx6RW9wsiBkANhAldoWv6smMZS+ H1hG+xUlaeuLSlVkNBt204494uVflljEwJhMuoMathf0HhXgpWwwZKnPDc6n9yfChn+t h5Wg== 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=B9rJQfX4dfIeOXpLw4etOZ1Y3ebTwSMBV28SJO0g0Qs=; b=tfd/AXXmFpAb2i3dd44vUnvaieaTrmrW5MzQ8UwAakGRK9S2RbbJXCLQD8chyEYn5N JeJA9vIhaCnNyTXFBBfRWobNqu2Phw9nwDHoQjNek7iDIuRDwGwIhIiJMzxWJigMUOHR ZCzwluhMt84sCQXi+ypd8nOGTOjT1fpgRYNoyIE6CdpaxAhymQPkIPJRP1ETym01BIUL JTB/qCZ5Y5vZeIlz+iesIEtR7ixwM6jFGN8T6yXH2mD1XZF1Y5/VPXWVYsD0m+c40wpV 4NYlHSqW2FhEY2gsFrJ3XrVHhU0tsT4qj5nhIgH2D0XyimK9YAMTB7Lx+AEZSX/ujAIu aYDg== X-Gm-Message-State: APjAAAVME5iqOYlTjqpLZQFqGrBqf0h7fYHSbV6beIHpXvHJ0OPCwKH2 UaWIIpHsmoHclAEsHtRB+chDDw== X-Received: by 2002:a1c:b155:: with SMTP id a82mr18652324wmf.35.1563878175256; Tue, 23 Jul 2019 03:36:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13sm50534835wrq.62.2019.07.23.03.36.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8657C1FF8F; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:51 +0100 Message-Id: <20190723103612.5600-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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] [PULL 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?= , qemu-devel@nongnu.org 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é -- 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 Tue Jul 23 10:35:52 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: 169493 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8702911ilk; Tue, 23 Jul 2019 03:36:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRRCjIWPp8JrgMBb+9N7OwMM9TBgFEtpqXrbLRc1wGHiwsZHWtv1A+zahal/2DEkfscuA1 X-Received: by 2002:a50:fa96:: with SMTP id w22mr66017593edr.45.1563878198102; Tue, 23 Jul 2019 03:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878198; cv=none; d=google.com; s=arc-20160816; b=SdqOWcctB9q1t129Rb1dMH1NBP+NohR5XfY+UQN11sjNFWE/x5x6zvD+QHrjZTvadD +p/RcEu/OgEyOgZrTNnLpsC7k5u5PS3EDYtkCUrKeCK4c1T2zOa17OD9Ym9wRIHougSu Zn1ONZ6f3ifPjgS007FkP9BMS1ET/9EOdIjqXgeny8u8gFc50ftesKj3Jz0xPcPFu4+/ zb3msQ4U4qxqh9hDyk/8wNjgSqs9bWUBNwYbX9lERLowMraCAC7Q6yUnjlq16GsOsaJ/ K4Ij1GyHjxmPPRXRqG2bVBtT/Bde32B2UAK15tLuOdyM+N/QVsHMmNGjjKTL3QIqDKDe W08w== 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=U0N4Iilux9QVCqxzdOq2k8lgc3K4HVZ6wxnptntO45I=; b=bx+lsRpCH6ztc5Ge/cUyfZBRzQevqaicqMChc1z87fxqnCpOJ6uGzOrmTjjfnJBnok Ldw0i+/kk/QyPdquKCfg5+cShj+mo+hvkciYFX2tC8QDNBAi3SbB0HjHx9VSt9PEYYe9 yMkrZK0NvX+T+W+d9e0kx5XPDFPllMbKaBIOFaDfLaylSJTbjJt03/PsbGONloqyC44x CG4vaMEmUmj/2GEatA6tuos2oQqlFcswDHyO7wT9pTV8VcxpAhGtCxZAepEOXtf8E+t8 XLy02LPuktI1bxkC9vze49oCyjN1bW7VVKbIDxLvwNhzXjbL3WP49wvnU9z23hA7suBH ZoHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uyatRNP3; 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 u12si5451323eja.12.2019.07.23.03.36.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:36:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uyatRNP3; 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]:40966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9s-0005p7-KI for patch@linaro.org; Tue, 23 Jul 2019 06:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37750) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9a-0005fn-9n for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9Z-0007MB-A8 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:18 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40477) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9Z-0007Ks-1E for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:17 -0400 Received: by mail-wr1-x42a.google.com with SMTP id r1so42595852wrl.7 for ; Tue, 23 Jul 2019 03:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0N4Iilux9QVCqxzdOq2k8lgc3K4HVZ6wxnptntO45I=; b=uyatRNP3MxaBDDjYD7TM1Kl6Q7cvLOSJK1gBjDOv13BPTnQaygixx+BJmMet63zvhM /0limyN8m8eAgcd/felDgm2cS0tpe9lWj98SAaYPCIJWxwXXmXSB7ABFX48AhiRrA/ia nNtNMpOHwgu69oGbXo9+OooxKYY8ZOK/sJtKf9U9s0TT2jYc0HXDJzWVHxj4yn8epB9I +q7zTTDmhnxB6PavH2ScB9bP2GT9Y2r/HHC99CVjNveabx+3Gipi53AYzUpsb51RTllx KlZzQShslzwiNVlWk3UPjyjthrXTrUtVxjkEIys/Y2Bdjeef8q2W7uIClWX+jIO7mT/I 5fGg== 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=U0N4Iilux9QVCqxzdOq2k8lgc3K4HVZ6wxnptntO45I=; b=XdKLwntvf8PcNy41ZgONB2GieT2wGTB1J1PAJ55FxtLGlMxrm9iZ5Vo6+kGhE0nnX7 TEqDkRh6dwr+xNPsOoMMoxIbfdpuPvd6CZkaDwcJJ8qk8tqV4qYy5U41rj7Y94oOk01P WFrGLSGJD3Wh1/UcbjWICLs9sbiCqT5pBAkQrmGJoQG22TFlRV76P057S+9cLcbhqvdV uaVrvsZYCoiqJTvq+877RmHi5wGAdYdnUE+qdBu1rUoIJ+IcD1vpkm1jYSV3g2n4cYNg H+Gyp/lm8LV5OMIlekAF/fQEF6+pjSr3/pgO7w1StDo56xoraj26rQWxCdNk/U87dHOG h3nw== X-Gm-Message-State: APjAAAVDvtyqVkxfiX6m/fxyiDUCAZnlc+e6nixKKu/UN1++ol7optAe 2570ykJX4kMvmihfABBn1q/UMg== X-Received: by 2002:a5d:6783:: with SMTP id v3mr80440310wru.318.1563878175919; Tue, 23 Jul 2019 03:36:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n8sm33476180wro.89.2019.07.23.03.36.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C2341FF90; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:52 +0100 Message-Id: <20190723103612.5600-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org, 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 -- 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 Tue Jul 23 10:35:53 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: 169498 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703905ilk; Tue, 23 Jul 2019 03:37:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqylu873X4bqFZxH2hI02GmXHw9Ao32w2pxtcu+I5DkMTOVm0+NOX4c+Nk0AMsbEfWuESemN X-Received: by 2002:ac8:2d56:: with SMTP id o22mr51901544qta.171.1563878263873; Tue, 23 Jul 2019 03:37:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878263; cv=none; d=google.com; s=arc-20160816; b=yLOiru4It/+4PbZ1ZV+Wb1EOzywODjtrwPG61q+CmmYHtBlqXuN+46VPq7Eq10hcdv mqC+wfCL+d5lrm9WnypXOFOH7047+l9JdgrxB7l9lnrLf7ltLJBmJUklGbvq2f38rhGI p2d9D58Fg7eLBEv/qTkpw0HpIfJoOTu9DLBvAKlWsp7cZkFFT+eBcYvbzvNNnUfR1UUE hlsTv0H5CmFQdiAZRpCXg4SsYJ8fUMIQw0zS2hYu5G3dQFMtHXGkDiqJWgZQDiMT7rcm 7EIRpYZzxV0cx1OEGZcKLpcWypSbdhbchJMemMLi5jdaDd79ruPY1NuOXfd37qqrN6PP rIFw== 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=VwUrgi4jKAJRQEbP+c7m0Efau+IX+/w4l0nX2BCVIts=; b=M0x/B+y6U/errlbYdM/4wcl1pY3WBk6I6w+S6fPoa6HRJVndrNE5V5ge6E8R335X0V D7vD/HAFKltfZkhZL80emkoz2mwbJWnl8LYVMMa/0ZDoO/9S5/itxX1RgWuKw8H7013t z5JVOj+qAe54phdjmObsFhc6ww9nUBRuC8QFgY8Hdi4v1S0a7BLpsdQ2X+jj/Y7qGcBC gfjXnzDcEZKHFvEnOyKMeiX8dhlr7VBDC/ZlzJOozllYRqQQsAocXW9woVnMgDtY0EKU BH21ndIdFUpELVkmx8iffxPa/KybDKHY6Y5qUZAVvFo0CQ2VUEWd/lgEqIrFISUEZjdj AGwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v5IqGYvb; 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 a5si250713qva.8.2019.07.23.03.37.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37:43 -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=v5IqGYvb; 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]:41004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAx-0002Hw-2F for patch@linaro.org; Tue, 23 Jul 2019 06:37:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37769) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9b-0005h1-5w for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9a-0007Mi-2W for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9Z-0007Lr-RP for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:17 -0400 Received: by mail-wr1-x433.google.com with SMTP id n9so42682764wru.0 for ; Tue, 23 Jul 2019 03:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VwUrgi4jKAJRQEbP+c7m0Efau+IX+/w4l0nX2BCVIts=; b=v5IqGYvbNGfWLemlqlBmR66aY5OU5yYyrPniSCbJq04emT/eGUfkYVZCa1FlDg6G0y ybDOz6H8EkeYJFe6VXmPzRfvJ3e40H+W26oLFkhxwrwBK/hTelOJHYvYfZD2rwTTl2mL dNJ6PmIRaEBy3JXL29m18w4rS3/m+w/MZxzYDRiIehnGWidEbOSAouDvA1901ijZ4PnM SSqh++MgAxCtof6C6mmj8PazPlCjgX1gKPfp6IlOi3rX3uDhE3YvsATSWaYoHjPXR8XE 8ILKFQCy90j+B/yfHTfoVC4uhTiPjwhQu7b1g6/Bvg28fRDnhK4dA/tY0FZ+1hU68zG0 Lnkg== 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=VwUrgi4jKAJRQEbP+c7m0Efau+IX+/w4l0nX2BCVIts=; b=nSeWSp/gspao5nAYqpcFej9NPcRjbvthFf2ShwgIJRgDZPJT0wJe82o2SxwJ10/YfC LuqDKPOULDYTOPgElx5xn/dmVTal6iQqjcfsek9QenQs5NTiKbVZleWXq//rqH5WEfn+ bamT3gEGA8loiqvJ19NIPpkUvqY1Dxj7lVosoqQIZ+F77veLrtNtRiQ910ZplIZWQM17 1JMnVP6wyOev4wVI4lpjA7DCH/Au4trvc4BxnEnNcfLbV8mYvwqK+css0OG56IV4Gr5V oupGi9BAHvfEtpnm74PE4KNA14VIebWg48Ez5VuMFX1sNtK3qgLFO2QT3J00FAFvc+sW qZGQ== X-Gm-Message-State: APjAAAUAxLfiZmzH60owMMrFI6H8siEn4rSGNiAMBbxQ7jX4YkxN06Wx YOzB7qbIoSyRwaWfRCwyg9U1dg== X-Received: by 2002:adf:b1d1:: with SMTP id r17mr81247141wra.273.1563878176623; Tue, 23 Jul 2019 03:36:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c65sm39811216wma.44.2019.07.23.03.36.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B03E81FF91; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:53 +0100 Message-Id: <20190723103612.5600-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 04/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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:35:54 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: 169500 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704319ilk; Tue, 23 Jul 2019 03:38:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFNK3WhibIAHeZ6aT98AWebmUwVD399k+0+HKTg6kkMSuYSORTOZEQidXAOjh/PKRG5DjJ X-Received: by 2002:ac8:37b9:: with SMTP id d54mr53519699qtc.189.1563878292155; Tue, 23 Jul 2019 03:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878292; cv=none; d=google.com; s=arc-20160816; b=HXs69rQQTUfHKksKdsVfNmS8qZH6ehM+DdkJ1s4K6aGm8MuiWcR0vr8fX6Zqez6+J0 C2y5ExGz91b/YP8ZSYrfHAJ6pDdz8PEvYEnivnOEVrn2+x4TGJk9V6yWuZTuWzLwOoIG AXBD/zLL1LlhBMOZU0NBWUsI4meUx7pM60a6xQ0WQkyV8gO1ek85B+fk0cUxPnkgTIgU 7PYFMU231jr3gvDqMibf38BgFAt/iH1L7u6aPGcKweC0TeRd70XdA+SKGBr7f/nIhVm2 7GdpXyd5qBkl6iG1Irt3wnKNxik0DNfEFoZpvWtfg/zWxVEb7RBY5y13MX7rzBFgQV0/ 5PKQ== 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=1aB6CS66id195EEgwuQ7Hg3FMvOUuzvHx6tDmNmk8yg=; b=lQQ+AaxLLqBedQ+1n7I0+BckhT+NAEIPUjQkp6HiHJiZdK0fgCWRrvJMUv4pL8Qvg3 HkP9Cl9B+ejRrr2SGh6SyembJkNyGYAWL9CpEZZ6UleOpZE0vO4I68T8VbmrbR7NOy1b q4g75gdJ79C2nVN083a5yvnE+rY5MNxPqzQYsLbYLWW8RlwkQ0wUNbJhKd9+Rkh1BcoY mHYyxDX/A06UPVqVDAEX6s9itSe8218wdK6mA5xMLyRKInTOMUTjpcY8ThCDv3bLNGho F+T4ytrD0yN8+vyXdrm1FdAHyeRz72i5NW7ToEkvLeYzENNWkiLen7JYkWNoyzl0fhtp HGMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RVy5HDBx; 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 t5si23933875qkm.234.2019.07.23.03.38.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RVy5HDBx; 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]:41024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBP-0004wa-9K for patch@linaro.org; Tue, 23 Jul 2019 06:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37801) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9c-0005nZ-Fk for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9b-0007O2-B7 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9b-0007N7-4F for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: by mail-wr1-x433.google.com with SMTP id g17so42618745wrr.5 for ; Tue, 23 Jul 2019 03:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1aB6CS66id195EEgwuQ7Hg3FMvOUuzvHx6tDmNmk8yg=; b=RVy5HDBx8clvfTk+OSqIJLjBqNHGrHLwDUU/Z68nry9MeCD6iJvyb6iGDi12MKEHk3 KgfUUIBzM5wlUKXailBbLSjU1cdJ03NsJSCfg1sWoRpagzihYFI4fm3OcBa5zAqRsMcV XxcvTrJaLLVZbOegToBSBnY7VYm0aii2Gxvamp8Tb1vhW6JhbhuR+82BfRrLaZ14JbN9 rVXKAqPCWzcp5dqCFBR9V3EPjKBo2s8kue/1jCuDFsRcejl1KvyNa2sM8fMFE/w/BwDG UxrQotFQRMp9fp4JiLv8wMbKNaEP+FJnQmGWDSXvUlf/Rek7/E1O1lmgKgvPkEZ+Wkcs sVwQ== 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=1aB6CS66id195EEgwuQ7Hg3FMvOUuzvHx6tDmNmk8yg=; b=gZxFIWXNFgJbs1bjwib0u9DTAT81Rr89eQc0VD9yabxiMXkwcSByUstcTqfEbITHLr 4eliNmN+0rqlcBnARZixXu391ImIIDTmwIMcKduFinhDzbPJdfs8N5YvfhFTWfl52pCw E0mIbLio5EH/UFsRva4wobaK72P6vCv4I1VmWthFjt0RcKxwkw7uFmrZsaSZL7YMakpq jPudt3il0Iwuk770CMJtNQep4S5oFmNCDKq88NiCk4ZDkLmMkf+kRhXZWPdVv/L8yl8O SIyCBJt+C6kwoDGkkq7T2guyTxxVBXW+0+ldgXIiyj3eTeXDeZ0UTHe63QdDcJUA6Bcz Z9dA== X-Gm-Message-State: APjAAAV3Pazzey6+FJR3bAylAYvAmqyEvrDSo2zXzZL7Jz1p2ZyjyTHL 7Eq1XtV2jCDvq0BsJ4K9rdnKIw== X-Received: by 2002:a5d:56d0:: with SMTP id m16mr77613211wrw.276.1563878178022; Tue, 23 Jul 2019 03:36:18 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12sm50472704wrt.95.2019.07.23.03.36.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C65861FF92; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:54 +0100 Message-Id: <20190723103612.5600-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:35:55 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: 169495 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703345ilk; Tue, 23 Jul 2019 03:37:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwawg5oBAOW2lOvniqod0Yxj8t93DQswyetMXBHFFKlNakPqN+3s6ynHcBKopthfgflH8Zj X-Received: by 2002:a37:a013:: with SMTP id j19mr51755569qke.401.1563878227088; Tue, 23 Jul 2019 03:37:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878227; cv=none; d=google.com; s=arc-20160816; b=iSPqrrabyG6mUcvbOdUdwI4G8AUh7K+F8KZgscfVLegA+oUol8Z9xtOKK7mFUIcSVq WIf0JhgoTXsfH+yRUAuHfHzYH/uJaWFyrQSWVdMU3DMoK/BdzPkexgmDLSoteQdQnjWL K/iFfzUiC+Rwszp01/kVjBz681xQkNgyRGyKQl5C6whTkPQAoRrW9dzDkAQG6oRgq3Ia HtPb7XlyilYt8nQXLLgkxL2e3E8SDoC9a6sbFjPougvx+/JDE5JZonNFmjQ9ZHYYsKiL 7WOFjOxiDRs3BBsdWcQGakXS0nNx+JvzhlaxaSp5nXYlIIjULYPjS0M40wPrJ+EtoI7v j8/A== 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=wpS9ypdTER3emr4GCEit5LCtD2h8CLnhaQIkW9n2/iM=; b=EjBvJINQvK95cOdIaG6ufDi2pxha61RlY8X3DpiMUrKCCGpozlxZsWV0AJks0pU11+ aGPikA77zEuYutW01TWN7EHBAd2+YKf34xWEhlBupWxHWncXKMEGV4ytfy5mHgdrCiHk /FmxtJ94Hzdhd4Dwq7o+GiJ9kY7pSF0I5Ocyjf5UNkx0aeCZaZVJoxtHPq/xvmZVaY5U q3N985167yQBubPB0w4/g1EBlVNmofa1iSNUGETExpz6mRMXbb2sF3v58qPQfucivb/4 nMlxz2lPQGrWVuWAkJOgZIbAtmrvHLAdIpKFrOiAYWYdolnEu5BLGPcuWUg+6mlymEKE 7Xyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="IZyu/5LH"; 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 k43si8589826qtf.219.2019.07.23.03.37.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37: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="IZyu/5LH"; 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]:40984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAM-0008G1-4U for patch@linaro.org; Tue, 23 Jul 2019 06:37:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37786) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9b-0005ju-Pz for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9a-0007NQ-Pm for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9a-0007Mb-FZ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:18 -0400 Received: by mail-wm1-x32f.google.com with SMTP id a15so37978516wmj.5 for ; Tue, 23 Jul 2019 03:36:18 -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=wpS9ypdTER3emr4GCEit5LCtD2h8CLnhaQIkW9n2/iM=; b=IZyu/5LHqg3UAbgcm0cRQOd1YJtA8M6QU032N0m6lbKIP3jmrzPAEG3eRgMqMOo+M3 TOjPy4sreJEstrWbJ4ftCU845TLFm8W+b/iGr96Pw3XfSTCKW/5DlWL1/JgKGRnnKLPy Ueh1YZu5rDHxwA1se3fbievXcZkgmyLtKAL0E6nraH7m6oIYBtsq4WoGk5xHhyo/QnD7 0c7lByeaq4d4fQxr87YzIlPgklexOgJPTADzIYJgdbqXXXJmMPVSrjkwGZB3jdTnw0Rj c9IL+9UUjKLw8fBgBDtuX2w3Z301TxfQpuLYXWJdU56vgPZP97k9rYCCnGg9EMS+uXx4 d9Zw== 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=wpS9ypdTER3emr4GCEit5LCtD2h8CLnhaQIkW9n2/iM=; b=TQkUVmbjkIvC5O/oceQ7RZhHhG1VyT+bl/sVXxunxWHpJw15T3rpF4Oo4Hes3Uyl0x 4s04MxWVQ+xBy+AwxWHEN4mmSziB/Nt2nrRjUxcpMaboXR5swnnP+erEtKSEBU8OKiFu w9GIEz7DcydOLDIiRTCf/QGQgGDiTRSM8o5leVxbnhIQd2aku89uWJQRgL48yNeb0gsp m0YNacz9zesg6ttplP8vOyvZRUCfMkkRg+gDIjAqVivj8tyQHwboKkWOr2cHVKtHdU+E AFIZKZGxlZlVbSsj5z0/+Q08xhqGLMYFi54igHVtHsHAdoAR3KMW/7h6gPh64Vimbnra 0v5w== X-Gm-Message-State: APjAAAWy8fQSv0FiSBJ1CX31oL9K5aPAXxNT5GJBzUzndFcsplaz68xf mC1TLU6ukSI0xts8OzjjLA1JdQ== X-Received: by 2002:a1c:1f4e:: with SMTP id f75mr66838930wmf.137.1563878177334; Tue, 23 Jul 2019 03:36:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 32sm35835652wrh.76.2019.07.23.03.36.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DCA981FF93; Tue, 23 Jul 2019 11:36:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:55 +0100 Message-Id: <20190723103612.5600-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 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 , qemu-devel@nongnu.org, "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 -- 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 Tue Jul 23 10:35:56 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: 169499 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704164ilk; Tue, 23 Jul 2019 03:38:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5wRvlkBz1nuj9KsmZo0iMncQHLodQvKCk5Yoeah3WSPXj/cX4P9BtGmzw8FrNLLA9QGq1 X-Received: by 2002:ad4:498b:: with SMTP id t11mr55666448qvx.139.1563878283857; Tue, 23 Jul 2019 03:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878283; cv=none; d=google.com; s=arc-20160816; b=vo6sMQ5IncyBl3QbcffuX7b2PPVRQl0ff5F+q+JydriB7mV+v/N3SvCSLRZ0VghiFq saloGgLTx4pqSLgD2XT+5sc5Wv4sf+Vzqbn1wslj89EF1kUxxih/3X2tMN7WLsjbbNN7 3Yvi112fHGI/gKyXVZNGJuWZIwxJNkJjRdDBLewWR9eudfeHegaz/usBEXVAZkKXxP1w sfPEKNZqZNVNS//c0VX9MYXUSqoJWrYie6fSCAxL4hRpfJQIDA2a9ov3Gg1Iot4vNeRj R0VN6PjBOpeAd/A96MBBux6SAC1UqUM9CPN8nY8Rq5vJBsP8cWa5COVImF29MKYoIHZT UVlw== 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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=EJCgr38eW5qSnA1uW8MzPmfUI/EtcdbbNIPMaOqwEVp4wy2wqq3XRIwsjrLTuzxAfr N+ffZYPS+MmxbkW2vDEW0SPalTvZ0Jw9nwJOdpidRvQ3GSMAfmNjuDzsmLIyfXj8A8Y9 3mG1knvJzBSpi7Ic6MFxVmc8PNLgtpRAzyZJcUnE0MtypbpnP5CXrgDik7yR8gqbXQSs l/x4dhMlkUgQPU+lk6runXdRP6xnKivyzvE3Z/4E5/1FDbKTlaaPis9jTBR2Q4WBJn3L j2F0f/OhaCeec24HqA8hkZbOb+P2lo/Ly8/3GUyAGUNrw4UPuh46V1u0F/YzEaox0oV1 fSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hYyChAPV; 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 c16si28873683qve.81.2019.07.23.03.38.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38: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=hYyChAPV; 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]:41012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBG-0003Ux-Px for patch@linaro.org; Tue, 23 Jul 2019 06:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37825) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9e-0005ur-1B for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9c-0007P4-IZ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:21 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:37894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9c-0007OG-BU for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: by mail-wm1-x334.google.com with SMTP id s15so16670197wmj.3 for ; Tue, 23 Jul 2019 03:36:20 -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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=hYyChAPVosqUzvnU0FuhghhtkweI/DOLQNcgqrLSCgH1U0T/orzZQX6cafxQToANS4 5RHu3htbPa3o3hlzRs45mhMNWc0rhXGsjSO0Do8QzsSCPDNscwAHrf0e5hlZjHVelEi4 I08oMEsaJH+Iik3zwG1iNfvZtltBrxCidSmaK97KQTPGQ0yf50ihzYIs71wFNIyS3QhG gO72tpJfRkbkLk8Lv4H/UMGPD0C9uQEaknHasPWfx43UdhbpVxSTRggw6b5XclqO03t+ OpQANtuNVJ0C3k1jP56/omtk77BqqUSQqij1fnRWL9LO4gIeHCz0pYuscxMwZABwMGvS as+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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=R1LqD145S26qnYTKhoLdDidwZRYNI0N8u9XTiFDhIz5GBNgM0dgdQvHmcGQd+lrsP8 zG/+Az2Z8/56jJNd6ZzhD/UfNVJQvdN6cydF6g3J5Nkr0srVTJPis9/BF/Vd8TZCnv8z F/I/jq59FtcHHyIvhcTNuzAU5x9AGjtFG0yrLR82sBB1I4Hc0OQ6ABf6m6gtaNuzih3l /EUENktlK3npQ8DvBENVSzVLJHGWjpBg2Tig4y35pmONQHBGI4aDjMpMIKofafPuVVny SiPYhFFrpeFAxf5mNLGBB8K9IZAKm1aHaH2uPgzuEFD3FjDlHhJH+Th40OXydYHqw6w4 lI0g== X-Gm-Message-State: APjAAAUL1UR/lp8wmTdKqDdMf3PG7CLxQtyi1eUgbJjxMBP0+5YDQV5Y TW8igmGmwAmf3kJjr+aKlr/p5g== X-Received: by 2002:a1c:968c:: with SMTP id y134mr67331440wmd.75.1563878179139; Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a84sm50325743wmf.29.2019.07.23.03.36.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0310E1FF96; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:56 +0100 Message-Id: <20190723103612.5600-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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é -- 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 Tue Jul 23 10:35:57 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: 169496 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703494ilk; Tue, 23 Jul 2019 03:37:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwSDdRvcDl8HOZEgynCZtIcHL9/+lKyRMtXZi3t7Q74X0HJOYqmwL4+uVItWm9dzl2iF6ZA X-Received: by 2002:ac8:2971:: with SMTP id z46mr51554938qtz.322.1563878236913; Tue, 23 Jul 2019 03:37:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878236; cv=none; d=google.com; s=arc-20160816; b=zXvy8KA9CCdrAb777buhCUFiCTArPJVUK2bccNFXWqGDNpSDvOArtQk9J/g9Ww0E7D PVGQxmH174BuQKvyNEa+eYzu2epQ/dOPQVwJh9wCNxnwQw6S4e3/r+ginjdla+2vaNdk ezExZJ1ptUhaGmsiyrY9S1xbhF1aLDebBh10RHAHepsqBAKM6FnETmTVFXSSRZKjzZwE B5SFToFpHSOPMF34icdqCKmIkZHl4QiKuPrq2ibvSMgCxCszAklxzP1fPa3sR+R+bF6d LqLnmOAIjTUESjpMvad4hHpV3Z18kBqAbFyQQLDlDbJLymkBRiKRvIo6zgRPb9jU4t8T fJNQ== 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=ALSbVid/YImih3quDD8Ltva4On5nsOSWCb8GPnKkNx8=; b=oQZmCKQZGipRmnLC6Q5Hf3aeIYK1jEF3k49vjdwOK/SNA4VhIuRBOrDqi47JPcbj9b DLwRNCJUcidAvLdnGsYitJmXwDDnMktBkCArhF5RL0hxG46Z0BFJ6YTLA+lHCRI6eVGy Td0bcb/sOvo2da6BvRdSsFSIj/NjPQN1n9AeNfH45+AGTwnSHYrfxNN96m1/8DJH4H3T wEFyPlGurvLCcV63K0zbT0BZBwF4tCIEE2ES4ZN+dVh+MWvs9crv2rW4Lq3+UPj9IFtQ EfUsQIhCTmuBuFa6NTQVnPbAysUj67nKjCWBAC/Q8zRi96NWxvUbunFSaGXYBoGH3f/3 jVUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bp2lZ3QE; 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 o5si6006548qto.317.2019.07.23.03.37.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37:16 -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=Bp2lZ3QE; 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]:40994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAV-000150-RP for patch@linaro.org; Tue, 23 Jul 2019 06:37:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37810) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9c-0005pU-V8 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9b-0007OT-TH for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9b-0007No-Lk for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:19 -0400 Received: by mail-wm1-x32b.google.com with SMTP id p74so37967408wme.4 for ; Tue, 23 Jul 2019 03:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ALSbVid/YImih3quDD8Ltva4On5nsOSWCb8GPnKkNx8=; b=Bp2lZ3QEylLuPS79oERMDMmKYweAHtC5n/6v1KieqcOgCnnnJtb5wR11gQtky5dahh BvhBLjjWWPosNRI8TJ7PlUWDfTRy4MCFxSVrk3SWSUMlw03olEgSZzVYhq5DP8iZNTRx CneHzlXl7rcOjLh/AoOU5Qyjh1xbFGmXSt05kSciVwIlPAeU9oiIPCGSqGJmoHhdNmuR j5N2YZFsfGGWeSkVHWRvUfuYAUXzMHoI5cHO2iDNEm6pQNBeU99aJRsaWxlmO3o7X3Ss +U2cQQ0/Nk2HwC3DTezs+nt0ljM7sgxtFwt1RBtqk7PLfViRZ9jtksK0rAU9pFjy1mpC N39Q== 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=ALSbVid/YImih3quDD8Ltva4On5nsOSWCb8GPnKkNx8=; b=shk6+3Ayp0sHCvQOmnvjqeur8ojPYI+UQdaJJ96x8NUbgD37jhPjYJAyGn0J3NMw/s 0gGk5N90J61nh7L4VbEapiwK3tzj5ogdjCMJCTvPnjnleQWkoYdsZXER0mWQotfcn76V ViBV45w4P0KWWcrfwsX4qaZABv9uotnk4Xa2w0JOMj+gXGJA2EASXo+8q0e+zjvx+YmV JozXMXMmjPWra8Nlie3wP4Ko4wVCh6zsAazY81r16jGrXM1dqNv/9Ex82n1eD03W/pvm A+vFNsWW+G7gIlmOf7CmuUjnb6LgFjF+JEytc5Wqhtp5H5CTljCGgcuZVsvd1cFdnqQz JvQQ== X-Gm-Message-State: APjAAAVI+g4v39Gj40nC4fIx2Sgx1cwLyqRjrNO5EecuSWzgHmFP8j2J gQAuJJgL9Ze/AmeI2mne2I1biQ== X-Received: by 2002:a7b:cb94:: with SMTP id m20mr65920742wmi.144.1563878178507; Tue, 23 Jul 2019 03:36:18 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 2sm54860322wrn.29.2019.07.23.03.36.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 18E891FF98; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:57 +0100 Message-Id: <20190723103612.5600-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 08/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?= , qemu-devel@nongnu.org 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é -- 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 Tue Jul 23 10:35:58 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: 169502 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704777ilk; Tue, 23 Jul 2019 03:38:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZYzKdPzdj1x6/5v1x2HLI0t1FSBcERhtz0P2JqCgZe+9sAsRDylOEuVqKX+1/zadJaxUC X-Received: by 2002:aed:2ca3:: with SMTP id g32mr54155046qtd.359.1563878318016; Tue, 23 Jul 2019 03:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878318; cv=none; d=google.com; s=arc-20160816; b=xxypdRvU4sZbiTSRHtrdD8h7/8KLq7YWqyfEyZ7m+MmNlutkJpCy9lvFxCcNUAXmsK Gwuav9QwY81h/iyrfsJqxOfpD/3z3Woq77Hv+6TbT1Uo7U135inhVuApoVFZNuzUY+MA SxU0wk4laX3oXMePvnn7k9grVijkHa7NAbGPXvWfAACjzX5FPpNp+fxrOMabe3s8yuvq Rzh2roNOs2rtRygP0ARjQmj72Vsae9yK1p6gLOUdfoIPIBu/bejHevSNv79+Ux6HQXPa N/yX6vkSv/I5CMwgGDnPTB3NwXL0CoGiXxz6qtXcHtpsBwMM6JPCwKxWfyM+yo5bRrjX Surg== 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=GAK5q9zpZRUsFFm1klLu6PZkQTgDPdn9WoHPkYsqZ/k=; b=AN8Zj8G65ZlZ1PNbiL8daCzypgznXaEKNdGb04gTNbTgp1xkrAsc5qE3Fjf6N0SZ9r SGSHpQQWhjuo7AK4JmWsgD62g8piSHmJ3Alo8Yxn36qkFtbDpwx/SOaY+s2lUfuvEFND Q6qf8G84QelQJKyMTS/6fkWZVQrrIQKj+IyYdkuwpTaInhQM0LeiG+DPDpq1klZcRCP3 Vz2eOaZurMXDmHe18N7xkRg/XQJxfHKFD94+PD/Hc5NnyylCUU9kT2zt9w1eEx4v/yUl ZvyZRivdawXWLRv/6QeJVTam4LAuJ/3KlMikl24cbA6CNFOcGQK5wIbYCrkeDf8f6022 HAVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lKTi7QKY; 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 a12si6795097qva.159.2019.07.23.03.38.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lKTi7QKY; 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]:41032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBp-0006At-60 for patch@linaro.org; Tue, 23 Jul 2019 06:38:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37855) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9f-00060X-8Y for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9e-0007QG-3r for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:55399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9d-0007PW-S9 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:22 -0400 Received: by mail-wm1-x329.google.com with SMTP id a15so37978670wmj.5 for ; Tue, 23 Jul 2019 03:36:21 -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=GAK5q9zpZRUsFFm1klLu6PZkQTgDPdn9WoHPkYsqZ/k=; b=lKTi7QKYqfEYLPMj6A7gUV0qfYAlm7dhxAEoIjzwhr4LSuP16Q/iZxrlO/rNT2dpYa o7Fa+R6jfo+ZWnQn8SHfrztniLUYcFBFOXkphU09fKfPk7xEDozWYoGrmjG5CQ2PZKoz 0daBvhhkj79WN6VIvUWtiyWbWDB0/mxb1ji+DsiAeoe43EmgsRoyttUaCOQBG5zH81vR Dco3eMMQEsJ09VFu9OYapL6rWsXjYUDMksCM41KQVz+tA7sWkS8G+iFYDnLP9puEYfUe X6W3+LOZBSco8pPV5mEB2t5otIGNjekKmjufu87KQ3j33NOcjNN/3hMW3/VxUokCduoM ltzQ== 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=GAK5q9zpZRUsFFm1klLu6PZkQTgDPdn9WoHPkYsqZ/k=; b=emdHi4RSsGa93c4VivBgv6zHFuyaOhY6e71ITcxYE7jth85O16oui7YXBRb2NG/fsZ Ol8u95vXEWSSw2QnvebdodBM58KXly0LMLkMAE1k9N0Vu02ql2wXNaIxdZBqfmUZ5GjZ BKidebFEa5Tr1AnzoyCflhhIYFglU33GBEq3T2m6+9hKBFJjNYy0KWKxP+hdYm11Ed8V ank5Z6Lqhdn14t09awGOopbOtSfseUoWUcmmOJ/kxb1pMuuI9hc4yWESONus4SeSnnPX 6NUJkoJVM8wG+Z6QJEtIAQVg7qAEi9pRPlAkTbiyNrt8iwV0VV/ogfbmcY7dWvOOpg7C aj7g== X-Gm-Message-State: APjAAAX4tqADSjBoVtXmC3snniIRV7YeQZqe76oFrms/yUEUC51t0CDb qFcOb9Ol7DfGLEEKwoFSqSIXCA== X-Received: by 2002:a1c:c78d:: with SMTP id x135mr61406671wmf.82.1563878180703; Tue, 23 Jul 2019 03:36:20 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w67sm52976031wma.24.2019.07.23.03.36.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F9F51FF99; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:58 +0100 Message-Id: <20190723103612.5600-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:35:59 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: 169501 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704432ilk; Tue, 23 Jul 2019 03:38:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyuzfY/yb9ohu/8DogHAX4ZfzICYkv1+b1WGLXD5VaMPUcfwhPMAkQF2WtX/PX+3o2wZskw X-Received: by 2002:a05:6214:10ea:: with SMTP id q10mr30576951qvt.4.1563878298596; Tue, 23 Jul 2019 03:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878298; cv=none; d=google.com; s=arc-20160816; b=t5jHDPEeS6tEhKfc7YHSJKfR5+FIvciRDRChrwjgJ0N4pEiBO0oHXK3CkxDv+YGC1h yOw5rWwQJsaKfqY3C1D4ThbpBKo13XxE/bWTQ9WOwQt5zcppJV8vxypXFKz/BER1xqfg dKdmbZ6zWtq5rAyAOvGmeAZ4jQ8J3vTCrR92yPxw4iL8SKcl5+PJrAqFfalvCuvtP7C5 5GIyeYcyiytMa3AnJNVT7jpj3MIirgtk22paDN3NkP0H0LyUcNMYydFpMndVgkjGFNs8 EgwT1kTqKUtF6M7ktdhbgk14omaL3JrMkqQftSA3KEGN2D8LL+r7j9qvK22fLnXHoHYr hU6A== 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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=dGYMOjcqBpQpwdsbtbqxH9vkw4YrysI9V6sA7Yj67Y9qNkFmvBP3bFQiSqDLw+3kbC YRqyta9ybp9zng+kFjwyosGFQGgqvVosEs4jRqJmt+g0GVuQu3yZZbDK2FEHv/bPXfUn k7zMkTIofkcvTDpxoLVp7uqbWNe/Txs8Il02uG0IM9J5dhyoeAMrpGJLU7qOEoep+ySq RALbxUuTYMJ/FYV0ncLKwOlGQ0aOw4Ykcuu4KWTJJMFQwIOoCDU5SLCHMOF49wDmDwSy ysyksfid2qb3xyBO6YtaIfkiM4uJN/UUus6bLV3TbFXiggmbyUL7aHd2NWmqqY++Kp+K +xIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qwZQC+jD; 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 25si493412qvo.149.2019.07.23.03.38.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38: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=qwZQC+jD; 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]:41018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBV-0004iU-Mj for patch@linaro.org; Tue, 23 Jul 2019 06:38:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37891) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9g-00067V-LN for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9f-0007SD-Dq for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9f-0007Qw-6C for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g67so33921748wme.1 for ; Tue, 23 Jul 2019 03:36:23 -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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=qwZQC+jD3WCCDZp/CtYaOfnQcywI7fF7tjPXRv03YTpOsiEU61iRDuiXJP41oC9P2E en1ubnSWOGvK0rhuzydoECUPrwtMGcYDk9NIr5TS9ozbfG59cfL4mam01XE7F0nfaL9+ oTGHa9OBIomRR39h+HSGpJ6vvnn4bVqQ4ZRvmQoJzdfvchijSryk0jHULWdbczXRfkhI AXp2U5M0pmDd+/nUiLJJIxCUpJDj81xZi/X56T3lz4YBKtw9EWb5Fsck+E6su+h5mOWR /iOEMyqLom7m860Fj5ROmp04+gFX2GLxEGyUWEQPdwdu7S7qNy+N/g0MHwnB6BvQXpli VTVA== 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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=W4p/jwOahZSfLT3n8tTMbmwxmYqTm/Gsvbing+GLZTLl6vAqTji3Lp+xaqFrK0y1I/ naKOEnj2+7p/rS0Z0SBBxsgtIHBiJO56LMAXECBDcj8q0OOroxncTmowYFID2z05caeE 9MNqnQgsVnowYtp5ILW/OQzkeKo4fmj2+JOt8334i1xlDylYUJKdkig/GJr9swgdG+Qh BkK+TIyWMp/0rw1urJZAisBOXJ5wtyAsYAHbzqo0uHcB+JQHBKeuZRyYrN76Lp+XmVtH YjZmAAAXjH4F9o8e/PI2ZcAzWT9jEo/oMR6XbLrbQhf4JumT4kdddiLOlamddPaueLaU yAHw== X-Gm-Message-State: APjAAAXTDyJC5OUzswkEYSaqqTfgfIIZ71nM5wkeZpp5w20IB8QS9nUv xeu7GIr1ewL0QAiSZgk4aBVZKg== X-Received: by 2002:a1c:a7c6:: with SMTP id q189mr69553043wme.146.1563878182086; Tue, 23 Jul 2019 03:36:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k9sm30856009wmi.33.2019.07.23.03.36.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 468861FF9A; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:59 +0100 Message-Id: <20190723103612.5600-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 10/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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:36:00 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: 169497 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703859ilk; Tue, 23 Jul 2019 03:37:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm2kb6BQOEN/BQzxpSC78YDe+AbMk9IfIryiuNWg5XPBt5bB9psP1yuPGBVeqOgfMp0NtC X-Received: by 2002:a05:620a:16da:: with SMTP id a26mr50630400qkn.376.1563878261156; Tue, 23 Jul 2019 03:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878261; cv=none; d=google.com; s=arc-20160816; b=gm2vNSKfIAG8LmifKGiU7lxj9sf/P0BI+JyQBCDfBW2uhCrQsBGW4IwJG+BeLv9rhF R+3DSwv05EU1A1hRlcn+Zdd1WoQZiB0zrx5i5VgnGa96yFXeORtMhBHMJxLyV/8kEoDd hYGR6OCS6BD5Gmgci5frGT6lbpuz676PWgWlM+ulDfQ8zorpX5ZlZQEs8uYECfEU3c5k uaCEjesZ8S6AB3FaEjY7ToijTASDAPl8NsW/sp/Mnfx6scCIDNuvkG0yL+j26Wje9qX+ kV5DIHKm1Gj/dJpdr4iwI1RlRB5rAbFfcXotf4yGyOi951JK8L9caBX4FZ945/6Najy8 lBBg== 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=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=PpJ4poHE/Bo/S9THDeiUma8mO768bU57ebcewncMLG07PD0Se+Ih6WcVG0syidz79b rDW9k+dcTmtj6mjAszYvibfa6gS3lSBTlv47/3oHMWmxUEAaG0hQ38+NX63EtcZb8QUx k6rf2Et0Jqa6JHOetW9myzBT1FlQbN5lY5sw6tSgmsYpzk/nTWEAFnDI02zLCE/rXrbH 5/HPHj4IXs+rg63l2Wherg5MrejkwX0nwEr3MUDfoHA2oGJh9xAJj7WNxzVmt3jK2Pha aEw59nBlRCc7XdwD80nEng7xCockipUD/XaKCpXCMq4SrFXz0DcQHK8UoJzet5HsDrDr 56yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eH2WthkL; 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 m51si31138883qvc.179.2019.07.23.03.37.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37:41 -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=eH2WthkL; 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]:40998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAu-000200-4l for patch@linaro.org; Tue, 23 Jul 2019 06:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37867) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9f-00062l-Li for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9e-0007Qe-EW for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9e-0007Ps-6M for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:22 -0400 Received: by mail-wm1-x334.google.com with SMTP id 207so37997938wma.1 for ; Tue, 23 Jul 2019 03:36:22 -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=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=eH2WthkLzyGU16o9xEWncuRO4tvUzNNBDoLToReS6mv5R8SiGxMd7WitV8HyWr8dt6 tF8vIsmgcPs65EERTAHBrBRyMwSG1TCj9yfMyaVEi0uxVJuD536Ehi3r/oCxChyWi3Kh 4HfnF3FhhRUPo1sHJaliaDfCjvvDa8y94WgHIEhWoBmlePvoZH/zcsN3ilezH2+ciTAY NUeJKwAsTcwyB7SH/Z5vO+7OapuyGrfNCR/DERBpUtKZ+Vd4+f+oOb4OOlhCL+p6+Pr7 p0LSQHmnTVpbZWMZ8z6vp+Mt6XoWduSrdxeJX2jm7h2UiRxUv56ZqAAGWx5c1wCta9gH 0Sqg== 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=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=azvYwQ5dSsOGy+Em5PO/1Sm6xGlpjHl7yjppVlwBEt2imBbE5WOhI085pbZK6JU/qd JPOrN6qUpLo7RWpIsOjzGfNRia067loXPZ8iwAtxKk0yK7EA77JYLix9tOv6LwctcYef SCwGP7vmPDnWPJ+2vAphjGXuEmfjkCt+gfyBZ1dFVQMXLgcWqdPaDflla9es3O020Vzr AqKbH/HPW13aMYbFr2ZbYx/Fbyk6cSbY2MI+zNlSYBTfC9a49HloAccoaoIz3E61Fh1M tu9sZq1gjViAxdPgVSfYqptHuOBjaog5iL4qZZIyJqEQj1i2QPqDeBYg76s7NsOFWEdp fNZA== X-Gm-Message-State: APjAAAWJowbNq56SCA57Cfs0UOghslq8A/KcLI2LmxoZEgzXobrADvDe 2UJpEW98eZN20IhiBtDkKgepIg== X-Received: by 2002:a05:600c:230c:: with SMTP id 12mr66522064wmo.166.1563878181134; Tue, 23 Jul 2019 03:36:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x83sm43239980wmb.42.2019.07.23.03.36.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B2261FF9B; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:00 +0100 Message-Id: <20190723103612.5600-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:36:01 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: 169503 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704858ilk; Tue, 23 Jul 2019 03:38:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqznJ0I4eQPlmuRb7jDLeW1yKGmJ0k8SKSyYNdNfJMfgEcsBUh9b9N3hlF6g00r6yDO8OLD7 X-Received: by 2002:a05:6402:397:: with SMTP id o23mr66016116edv.68.1563878324194; Tue, 23 Jul 2019 03:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878324; cv=none; d=google.com; s=arc-20160816; b=Rhvdpa2L/wILpF/XW26pb5U5c9+JxBtjKT5r3fvcVO/kQC2qlfwa3ADjVgz6vYN8JJ g5LVjk92t8MV4y8h+ihOT/KcZNeLmjLGOHbOcgB9cjigyW8ZfptugjMPJOZHYvkrZlmq uHSYy46R+zbaYfmapUMMd/5DIaYxjIGs8a5ttvkYMt9lj9GZdrECM25rG2fHrG8gvWF3 IxspW8nPKR3CH462laM/gi61eg5uX1ux2MtdRyHk7TxOIlnwXBTkboWSnnd/ZeDUP/xw bs1jdgl+eHXN+w1XE3h+rawuewS8jmc5NGMrqExFDr7cmUHSUNlFgAzRJdXAeRYSM7C9 5P3Q== 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=c6E9BddK89xMbl9F10ybA11PGnEiUFETjL7X7/hYQAI=; b=z3fkbFFDwBwv2I0dUAWQYfzuLy3WWGaKDebSPX2k3k4ApA7t7/bbujCDjkbSY+K74Z sYubP4PSJyUE3D4w/pX9lzi+NYQrylv/TD9FnbMXhEMYboncT81RLCTt76paVl9J7bJX szvn/d2ic1+yw6S4PhXyihUxWEykzaaSEnuHNMkT2czumJaNXqUdhLjUZoFBGKC/NZ4d VCTSel109QaX+3Ux9KpD8PIiSuyH4gEEyJFejaD+E88lbSX7/AJBX23oRaEbcdiJ1XQj fV9G2o+jZ8/uZA0YaW0qrnVWt6oluAz5oUtncW2D4Yh3K4AgDEb4EGqrX174FfvLHSyZ sJZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mkJ8avNu; 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 b21si6338961edw.264.2019.07.23.03.38.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mkJ8avNu; 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]:41040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBu-0007RJ-Tp for patch@linaro.org; Tue, 23 Jul 2019 06:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37896) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9h-00069P-53 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9g-0007Sp-0B for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9f-0007Rd-QA for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: by mail-wm1-x332.google.com with SMTP id l2so38017599wmg.0 for ; Tue, 23 Jul 2019 03:36:23 -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=c6E9BddK89xMbl9F10ybA11PGnEiUFETjL7X7/hYQAI=; b=mkJ8avNuFPrS7/mSRnN1lYprKD+kSvsejyVMs5szGduYgIgyUUvjWnf2Qju+B3wn1W RtImk9iGRf5xrz9SOdZSL4clXXh0cNDVh94piScbrB9u5BUp7aqlWzkcC+ud43wHjFgW kI+lROGOhR3cHytrTEauZMfYg2/Ocoblq/9dN3rQpTj+7m3ZVuKTPPojJdWhfjUg8/gy OkUJVyOn96sHjRvTnL180PlrOhoHZq06VsCB0uvUVfiTiRJg55o1kZhVov3iZx3UWySe BgqHY0uequD2WQjqXCnzp1n8Sa1h/L4XDPu5FlhXVuUlEC8HoOICfr9hedbf6p5agMVM vBSQ== 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=c6E9BddK89xMbl9F10ybA11PGnEiUFETjL7X7/hYQAI=; b=VEESpC0U/Rq2WBLSNZgGA0fpq9Nf/dl1YNskaWFrGS5VAtBL08SIqdUrPKc/oQz+uh vvc/FcpGocp060nJEeahU6+bETJUJjUUO6H8aK3n3b4MTZiv+oqwzwvLu4VlyDVAcoys nZ1XVPmQ7b0Xp2+hh2givYlyyH6hUCa7C3AUHEG2WifUEz+n1l1d/fOyQL5fA1hta9qz JLkT9qUvVHiFHBq7sAXUBeWZ8hTkmJTPV5REShCV2xqqN7SiSjEvClU9ICTi5KdODv2k pROo6jcwP+6psfW4ILzygduXhbVkg+3adWPec7lcNDXUGOr43zqSsaq1+ZPBHjsHd4u+ xspg== X-Gm-Message-State: APjAAAWDaDQ6r4gB6PM+h8kH7vE3v6qv2idMPYJW9UZ4HqbqMwgF8zis s9tUsL26p9p8F8eUYtaIyiGpcQ== X-Received: by 2002:a05:600c:291:: with SMTP id 17mr67071325wmk.32.1563878182638; Tue, 23 Jul 2019 03:36:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v204sm42941386wma.20.2019.07.23.03.36.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6FBA01FF9C; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:01 +0100 Message-Id: <20190723103612.5600-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 12/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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:36:02 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: 169512 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708570ilk; Tue, 23 Jul 2019 03:43:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2t3+YY+HSvrsKG9XObIAV190flkmoQdr2yUKchyFBy5bP2cD/5lSP5CkFbf0uFeHfBlRh X-Received: by 2002:a37:a854:: with SMTP id r81mr50440384qke.378.1563878584252; Tue, 23 Jul 2019 03:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878584; cv=none; d=google.com; s=arc-20160816; b=zzDWfYQdjErQxqQln70PANv+e0ucuYc67XIhj5T7DqYtfLoQCwMg2m0g9Mnag6TAK+ zy8XNt6tp26JjcPf4rveCxCSFlOmTiBzkN9NBTS91GGZLZGMnkpUe88fuix+zwaNoQh8 iCZMB3ERTgoO/ZLRLb+UmAN/WIA0JYGw0sTtDudlhkKcoqrem35YQv7G6GzRfp6KJQ/s 4vclkNKsR7eKSY3ZfEuXRDvdvllGSEATu0GRpyGxHiIlb+VRCDvfZ0CrnstOIkHfZuG8 T1aFEvJrSMdpECGHMBdUToR9OoqTiWH+B5d5qcOxQ0YTIT8QWjg5A2imxFGG3bbic6jt uxlQ== 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=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=TGTAPIKntkOo+MAXfGmQvb/M1xUcZcebTUaffv8oiFHFDK/hjhXJQYBdeb26gwzeYc wGsuswhGy4rzbChYu/XOXvbs382e5eBwTsjQwVCTfHMl6hcoL0UEQo0X++V0clqZukyZ 4fVaNWxaar1D/SCFfoRqrwt/DhQWJfkdLrPxy6kFyDHm4/ysvHqaSSURQ9YnoA/UDTK5 NQ87kbwl3Et46W0ZAkV3Mcn9r2XxSA++UUjDd38dkip1iE+rYNt2AtWhEG5gl143nmtN RpzJHpvIW90GhING9do2i0WtsMOAC/oTxDNOBVJ8oHEIm+8wuErbX3jHjVmVdw9F2xbV armQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vQQcc/RH"; 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 w24si29790550qtk.394.2019.07.23.03.43.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:43: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="vQQcc/RH"; 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]:41098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsG6-0005or-UW for patch@linaro.org; Tue, 23 Jul 2019 06:43:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39708) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF6-0002YO-7j for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF4-0004Eg-1i for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF2-0004Bf-Tz for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: by mail-wr1-x432.google.com with SMTP id p13so42587674wru.10 for ; Tue, 23 Jul 2019 03:41: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=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=vQQcc/RH9uoNJcNUwJC/l2/wO450WSwrjbpzrwGju6XSPLaxKU0Jg2niKIzhBJ1j+i k9kl9qhv2tYOd9aoQ2z7PbtXL4lSrH5UgwxUAGyYJw/QJ2b6whbLKS7gC0sokML7QIN8 LQxIS3VAdIUw71CJRZGaDUzcoAUrItg909WuDWeu6A4qibXuLLivDfMTeW7m54bwyALp FCveFbx5IKDrkc32g8UEIJPMR+Kp+Ksnv/dmCLjxf7y48uZEbVzsKLrOiY0QpxKjM5Al e/qf1TpA+L+nf1oHDCPqFH0/UdqYxri7KKoYhx0f3+hYLnxAcXECsB1U4B2CyJ0fonqO /giw== 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=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=i3htd9NMsn7KLo1tJuWL4+4gUGVp+8BiZLQS4JFDJjGfWDwwC3DZUy2oAMqw6b3kX/ BhoxVXFKEUop7NmyLuudkhBXmsgkXvDm2jGDE0KwR3sG388XdLPTJixu3ntwbPFAaZQB u71jHEnlNj0glsxqNU8q1Fb5/17vHlG9rSr0clOGDkqcUhEz/1vH5Kf4FdLG+vEFobYX +nwAl/tpKoCwT2mvfyusFIs2kcZNGpL6tjChfnc4P+tZxcJMzOAbsKcTwO3WCoGtyfyP tMReETiOS2iILaMymRsNo5q9YVZ40R0hUkl+qvZ5EUAgw8ZC/Ik9tRaHJiZjn2uTBehH YkHA== X-Gm-Message-State: APjAAAXeQL0XnxTUTdRObpvTBNiBoe/73AEgnOOLFvcqBpvm+Ex5CB4s omoGHXEGpxst8SxIDhZvQz0MkA== X-Received: by 2002:a5d:4206:: with SMTP id n6mr13766419wrq.110.1563878514687; Tue, 23 Jul 2019 03:41:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x11sm30365330wmi.26.2019.07.23.03.41.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8419C1FF9D; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:02 +0100 Message-Id: <20190723103612.5600-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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] [PULL 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?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/Makefile b/Makefile index ecb788b2ce3..b3357691cad 100644 --- a/Makefile +++ b/Makefile @@ -1077,7 +1077,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 Tue Jul 23 10:36:03 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: 169507 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707748ilk; Tue, 23 Jul 2019 03:42:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXsaIEFlY4w40FVZaG1JGs0iGYnBgPFihUqD8b3m4nv7VpsTfBCbVRno9H8Zksg3BjbI7y X-Received: by 2002:a05:620a:14ba:: with SMTP id x26mr49654997qkj.328.1563878528021; Tue, 23 Jul 2019 03:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878528; cv=none; d=google.com; s=arc-20160816; b=NxMJGA10+eBuFlFMUdMcuvD9Edlni/UTAZXaKN0YSP5SWI8nbsb4bPsEmto7QoPMn1 4cJDDBHeNWKX6rJB9H76s5W1zqpKK7Qbo45y2ElLSihpgeeLbkVOn7Uqj8Is84VEScVc xdNVJ5J+vyAt8LvtC38Fw6b7/ywbZme0v4JiV7xpt7189rvZAl6e4e9599x1iChMOs6v t2IYSFXPPrgJE96+e+XIcXPE9BZGfQV/sSmiD+9hG+oh5fq4dxhD7zFw8+EOhcJ2jOac lJnF3SsbPWZ2ae1dVBNu2Jobq035mcIhqlphrH5gDZmL6G4IEnsG9oqSTpZnqX5pHVpg XtGA== 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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=DkAiAnXWFr0UOusqWLQOSUkfp0VCKU0Io/9KduT6/3B8e0t7wY6LBnmYP3UTk9/OLR zbsh85VHYqTNrSrzhewWGzfo36X6BveOmjldB6x3BmC4YmcZ7SLKYS0LyfAAyLV1+Lsx SobnwDxeWCIJIPc7K55CdNti9S04qI0AWlc3/MMIGs3Cye17vaH9BzYaOLisFem8ViK9 w9+OC/9G9rJANwDIWJBb3x7DS54WTk1vcQBD3N4WC28TFhg69C94AAmMKqdvAPYFx9Je 0+7SAi269R4MtmkwDBnRKvHRxxihhNdH7m4odTF/VQVffAMkTf2YNiKbf22pW2MTpGRZ PPxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MD+YroMo; 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 s190si9708559qkh.220.2019.07.23.03.42.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MD+YroMo; 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]:41074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFC-0002iZ-SX for patch@linaro.org; Tue, 23 Jul 2019 06:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39673) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF4-0002PH-1m for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF1-0004CX-R6 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:47022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEz-00048f-Nw for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:55 -0400 Received: by mail-wr1-x434.google.com with SMTP id z1so42591809wru.13 for ; Tue, 23 Jul 2019 03:41:51 -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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=MD+YroMoTvLg413MMnloRkdiOW2Sh/wBORPDJu3ueOvdzpvgPV10qrp1dhHKYTIgaN Wog4FjNH2GFM9jy/y9se/fqQxqaLQldQOJ5jhwZAqX6WkEpl8R3LFbGHShRK+7MNxmel pRWNACFV2nVxyhObSjZOKejg7kCrLa0ii+W67iwJ6OFWsJJqExIZNaDj9TKzO4iOXEcf zcT38xSDU4ASwrc95sg2Fh4m5M5Wz3zElr/94YEZhiry6Sg+0u/CB/VJW3m58lxXr76j 3T704B5su5rZay/fI1M4KoI8BKWRm0/ncZACGo3TB+etrn1XhKenadh5u/VZFTh89jPV a5fA== 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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=i/strnuMhwI1VtiWdHOar/zcaxqy9GnYx5j6DiSQFR6lGlmWPBUhDFYvLOsp3EeL+m QAANNvTIwbt/1Lxd91JDLdjfTfJsddo45T+UvgnId6ulk/pJL8gR1Ik8p06f8BErvVcC vFLjB55w+opPNe6MsqcUA0iuTOEfjfDAO/919ENkKR+qJLlh2xUy+UUpIJsqAovC3HGO 57Rk/sB1/TCNScPFtM6TKXu/neFzv92/CbNi+8D1xzUzo33A2a8sdC8ezDcgPWaWVT1J o/Qi31jPMBJP9Fl5I0YbRT96KKju2g1bwrFVG57Av/884lvpWkuZLlYCH6ya1AtIHwZL uwjg== X-Gm-Message-State: APjAAAXkwILygRBRAGUAYSexuMZGsRitSqSvTL9JBiEOWAA9THn0RbEB GBneAO2JgKe+dAS91Bf+6n1wbw== X-Received: by 2002:a5d:4211:: with SMTP id n17mr11293292wrq.137.1563878510848; Tue, 23 Jul 2019 03:41:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n5sm34368758wmi.21.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B2C11FF8C; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:03 +0100 Message-Id: <20190723103612.5600-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::434 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/Makefile b/Makefile index b3357691cad..cfab1561b9c 100644 --- a/Makefile +++ b/Makefile @@ -761,6 +761,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 Tue Jul 23 10:36:04 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: 169514 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8709245ilk; Tue, 23 Jul 2019 03:43:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyob7sxf0v2R8pLxIdwVuIhKbUpcH+tf8u0vdwXPDvI2fM2qxH/g+TMMHjIYmzE+xaTsYL7 X-Received: by 2002:aa7:d1da:: with SMTP id g26mr65098218edp.198.1563878630998; Tue, 23 Jul 2019 03:43:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878630; cv=none; d=google.com; s=arc-20160816; b=AjoFX7U3nnIQxwYLsfBYICMHeiDHaROCsgk6yZTmtZu6rejk5wFdFvVJ3dwJiGX1Ez jFUq7gwJK7Yg0h5TyBgYL2x8Wx+ulFhbPlADz0wWZ92qGrQOoCprLuMfIPdORpLYglJF PimJpgjtGt59h81bB0A6Bql/XZgNVnd/VuQF3M6dNy+mZyWC5C0Z+CtLhuz7Tuw0M9Qp sunsrWqBjACaIc3SaDihbEUYeQgTVtyVwwZLAqi1w1zW3rsoB1ZavN7TTQZzH3yuoklC 3Z9ufVMw5zlhszZhDU6c/+uAzZGUfmt5Pf8nHxcQJEExXyBpB+QIkUxvGsfGjecn7am3 /lmg== 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=4Y8RTTqYls9hTDUlXAyFNq7X+0z2NbmIykj1cvcDx80=; b=AgvXeDONUt2mOkvmxe/oXsPZ9iXdVqwSHOYPebtOdoiyWkvXLSXICTPKuaKmcOphce Vnv/vx8tJPtiqUImW55BEhC1P5UqtCQGKC5FSNDoUEmmnyXzjf6cNIcE/WNPdwADVBMn GCUyqKWyF4/aP4Du/SdeJbAQwNA8c0as7ZvhvF9v5QxdvNEK6Q7f5CWXk3XjAqiUAJqE 7GBrikVhr8VoOSuEb+gTkQOfzvHA/PaAnzMYjugy8dJRkGVhcW+J4N+S9dMebBPglwGB GK+I2pKO8MfQ03KqtB96SXWOZWqyYWbdQvSI4ZcU4+4sLN+v+JmlDd18E9VoywZoEC7A 0dDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k2hVK6Rl; 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 w1si6306613edc.440.2019.07.23.03.43.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:43:50 -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=k2hVK6Rl; 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]:41132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsGs-0001oc-0V for patch@linaro.org; Tue, 23 Jul 2019 06:43:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39766) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFA-0002ro-5C for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF8-0004NQ-4E for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:04 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF6-0004Au-A3 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:02 -0400 Received: by mail-wr1-x433.google.com with SMTP id n4so42696151wrs.3 for ; Tue, 23 Jul 2019 03:41: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=4Y8RTTqYls9hTDUlXAyFNq7X+0z2NbmIykj1cvcDx80=; b=k2hVK6Rl6dco9+BS0IJnAVgDy0iPf64Ic9elKBlDGFoBbnXQVUn0sOsIeQpnA9SK76 uTNLEvl2IQcIqeEnyr5LHx8X1jhpKHK2XnYLLkRdzQtqOsO703zMg92lRvdfS9cQ3Y4B 30vaKWF02b6crOyQPXCLn0yXtabohBJlHGYL23DQmyUEZOG9qWSCs8uif/js+ext5+kf 83X+sAT0oEnPZUAgVdtW8K++Z0MvMorNqrLWEvFJG7iT58LE2epQ0ifWUScYiZFl4yyN AAA1lG7CQSELKNcET3w97uruVH4zzFkeCxG+r1eVT/F7oPcyxDrZiTzj2ak+ahjbs56z Ij9w== 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=4Y8RTTqYls9hTDUlXAyFNq7X+0z2NbmIykj1cvcDx80=; b=i9CtB3OjOaEahhDQc80M8/o5B4kmQU49JifpcF779ajUgZ/JmDKPMktdzVh3GRtELa ZOmLp0KC9rMZDpVFQY9Si9/K0l4W7QpTlxB3fQlCtgGJ8HWGJ91+0/wj+3Gd30ZHObe7 KA5VVDWkKCbqYpTM8wY+u3uwDCno5mtzDCjSfcszinqrjp8yMNtuxbIZmx47zK9iqgYH mJztKlSqDpyNC1WKllMX4KSEAaJ9POa5yBw/16uqXy+ln0ZW6WsRyRrA5/afJM+LIncx CYJXX/bnBJMXC8/mtwI3ZtxzG/urDebeOR59i8XMdU3wq3SjdW4+jORRxOF/iXp+qmwn UYKA== X-Gm-Message-State: APjAAAV2pXfKUwpZ4R5/QJWHGl2vlWqt03P9OPexUJ1nLccZZcHMNAZ3 FEURY/toI/qeqTaonGt17qnLXQ== X-Received: by 2002:adf:e50c:: with SMTP id j12mr10369413wrm.117.1563878513427; Tue, 23 Jul 2019 03:41:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c30sm73689022wrb.15.2019.07.23.03.41.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B073E1FF9E; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:04 +0100 Message-Id: <20190723103612.5600-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:36:05 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: 169511 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708468ilk; Tue, 23 Jul 2019 03:42:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3n3O3uo763AbU6SrJfIO/lv7foX1/PXLypSRZiywH1ZO9aZJJd2krtsbvh1uEJOhDR4vL X-Received: by 2002:a0c:f952:: with SMTP id i18mr39945298qvo.205.1563878577896; Tue, 23 Jul 2019 03:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878577; cv=none; d=google.com; s=arc-20160816; b=IPdrfcYXRSqTXVergXjYAPD51fh11IG6HbBX75SW/ntHNmYf3x4FnNT4ojWv9XnL9a uiELSt/F0m35EY+kc8tp+UFNGBkExMexTbClDTa6EUA0TJ3jkwDf1cKzAGQJXgCVBqxU oRujxuFPjSuM8vXKKJcT52P1tBNTzZIod050Q9VfNyx5BKjcyeUTOcqCqwIrBy4OLwCO SzT/LqowrxUyzsM0XGKv0JVELmsv3vFnZ98J/q/YsQdlBwgBc0qgXz0zjhZ8YEKwMEXv PsSo1sqnVM2pvb/iqigmcZhp+zgm8fug02HGtNNjDLtPKMSQmCD/lB531KvEDQv3CWWP DoRQ== 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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=HtijE/JPGXzrdn7H1iNRLv++2y1TucvrKmzBzTWNjrV4GW8z16/YgFblEFhfmhre3l 531+tIKXs+8x0hqaAUSNFtDzukOFJjW9HZhKTGmXw5oZRtNN8DuhlOlFDSPAskM/i3PB dloUkOTCLGlwoYwmapvCp9O8WvHVyw0iuWZY+X5s1SscxcLf6fLNS1Ww2j/V3knH0r8g /Aci2tpFxT42kaK8zwbPMSflUHUEoMheZ7L+++s29UX9zqa0NfPaxZlxfSU8+0gRp6rp FfZdd5htxAZpiDi56Zkd3a58B4mhnxHBR3tKdNvHRc6K1m7rW9tbLEOBaMf4hZSo6tSX LNDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AJd0PXY3; 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 m9si26347921qke.19.2019.07.23.03.42.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:57 -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=AJd0PXY3; 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]:41102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsG0-0006K4-Ls for patch@linaro.org; Tue, 23 Jul 2019 06:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39768) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFA-0002rr-60 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF8-0004NG-3T for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:04 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:33350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF5-0004A4-UJ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:00 -0400 Received: by mail-wm1-x331.google.com with SMTP id h19so30817641wme.0 for ; Tue, 23 Jul 2019 03:41:53 -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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=AJd0PXY3+S6kHTbr38KSv9v8VAhnYMViYI3ig4eOV0zwu8+J4FdY950E5BCLX+pWNN WQ/EqJLh2Wk7A0aGoMEE/ne54degGOwRD3Nq1FOarCbHxd2eVhFvVCFHt1xUNqZ7pCN5 gcJ7UnuHVqjSPt2KLBf8G2rNygFjg4N8OI/aHhAkkIh+DzOtwa27JT1UQsGD3vQwIIxW DyalNHd/TVt6zZ2YmTaif33r91HrGp/TklSRtDvZpGa7oHZGxmTYVrhKuMQESCT606Co 9V2mmamO4n1lAtqDL4CrWpi0FsXRcofAjw9Wki6usuHY9J2vDCdJD79Hb7ZEOQhAOdav z1Og== 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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=OaKwpmF/qSJKcAWtZuH33RTYV3Nw2hWph4UAkvSgVRK7RVrmz9TJH3G30PeZZzIXZA HbNyZO8CEhkhZYn6evooPeySqR1GdCdPqt0oO1wrgEuoSFsiwNoDMPzCLzOXA6kcAigJ BoNbm1d+Lkp11Eu1d2PXo6nxqqnZaH6URNEQtWHZAFNiHHP5EK2r4OGjTlcoxV7t6zRe O+J1JSlKWczrw1hYrguwHv445Js+ek86xkBUuoDFkerIVoc9qTIVBahSteL54hx4TqAl cluK2gpQs+qSMKk1E6UlcwqOebMIGbzBbmBEMmlT4B99RSnbSYrnB1KOgb9eSBDV8FNn KO9w== X-Gm-Message-State: APjAAAX8QMjxA5PGuJ0UO039vM82frP7GncojJnDc41J01FofjqDdOgD YmOyVZ5RnR3Z4nNtzUuhw3uKYw== X-Received: by 2002:a05:600c:225a:: with SMTP id a26mr72127529wmm.81.1563878512827; Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 2sm54886497wrn.29.2019.07.23.03.41.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C61BD1FF9F; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:05 +0100 Message-Id: <20190723103612.5600-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::331 Subject: [Qemu-devel] [PULL 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?= , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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. Reviewed-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190723070218.3606-1-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e0..d0df0f4e3a1 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -106,6 +106,9 @@ RequestExecutionLevel admin ;-------------------------------- ; The stuff to install. +; +; Remember to keep the "Uninstall" section in sync. + Section "${PRODUCT} (required)" SectionIn RO @@ -122,6 +125,10 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" + File "${BINDIR}\*.ndrv" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" @@ -210,6 +217,10 @@ Section "Uninstall" Delete "$INSTDIR\*.bin" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dtb" + Delete "$INSTDIR\*.fd" + Delete "$INSTDIR\*.img" + Delete "$INSTDIR\*.lid" + Delete "$INSTDIR\*.ndrv" Delete "$INSTDIR\*.rom" Delete "$INSTDIR\openbios-*" Delete "$INSTDIR\qemu-img.exe" From patchwork Tue Jul 23 10:36:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169510 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708341ilk; Tue, 23 Jul 2019 03:42:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjPHdi+Ee8TbjZiB7uesyPiEbVRFKHq92Yz04Dv4zV0nkh0QFKX75uBeYYuk3veT3gmhPs X-Received: by 2002:a37:e10e:: with SMTP id c14mr47453550qkm.54.1563878568905; Tue, 23 Jul 2019 03:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878568; cv=none; d=google.com; s=arc-20160816; b=IChPmfcP9z5PPhu5DYaTVbj70z61u3Myh7ArGL/7EAsISRH85AQ2UOkz3MopfTn0Xj iX6Bahu3lmPNpTlBDAj0RgPgCpzL586wsDrKGEblswTj5n8W5AVx/hEYKkR5Om+u59mr l6ZvINIZEqDVgdWG8T7R0jzwDZ2retBZJNbs8Yo4SuZmIGmajnFhrXf00Am5PFFRxUga Cf/2F5QVtKFmzkcjpBx6Rkhhi1Et9ojR3z00JxXIF791GhSv0QcyaPFzD7leR3CEi79M FAxFBlJO5GNn6cGOdXp948EauZQIFn1/nRlUTZ6Uv5cFhXZGFXbMrwpLrkNwHL2GT5/5 I0Tw== 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=k0cRgpglCD2PcKK9Njfjp9ahbK4mgT1ZXlX00pGzzsc=; b=J/XPXneJRYRpJBKLZijAbGOBk16/VhvxGGmEozaKlQO3ynXrOEP+ek1W0LiJh673iU YMu8zV8O9vZzR90QsX/gHbb60sugRxm7Ddh0kDi4/nHRKHsyKOlwoBdXuYi9kH6OHxc1 /Fg2YBL+5M6KxjK3tWxyvBwQ75/jjKR0lmg4OqQT3/1fahsPfaXrDWwOyJHiZZDeL7lk R4tbu9s9lFSNIQit8SowP4XXC5aUgNIkkPmfuTY3v6CcCspCJ14gyFmhlzua8Iei+w3z eAe+qe9GGu1zN9ZPX3Gqqrie1E4tmR/BNKvsfof8w2d4cgZeVHaTir3zQE09G0XRSL2y ydoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iSbO1Q5+; 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 s16si29095791qvc.18.2019.07.23.03.42.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iSbO1Q5+; 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]:41094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFr-0005ba-P4 for patch@linaro.org; Tue, 23 Jul 2019 06:42:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39671) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF4-0002PF-1n for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF1-0004CW-Qa for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEz-00049C-LF for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:55 -0400 Received: by mail-wm1-x331.google.com with SMTP id f17so38029614wme.2 for ; Tue, 23 Jul 2019 03:41:52 -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=k0cRgpglCD2PcKK9Njfjp9ahbK4mgT1ZXlX00pGzzsc=; b=iSbO1Q5+/Yo9C3K/uq/3MxLeuXxOvA6mG+XkKyUaR0L0mCcTI28nqav4GU7XnW27e1 MRrVx95yJ1XY3uvUIxagXKzrYTphlj2OfXUd47LvTlgDeIFRX5yqF/nf4IyFnOqX3RrW Q9ewxx2pTuD1Hr6c7fqZaDMaxsMhU8rl11YT877zWMoKNp/x8LQ4eT7hRBoIPgX4okd+ +fbrDZwnTgkaPV20r08uPPApf548SOFASEqcRO9nyYMGR5kuxo+C+u6FkrgcSn5rTS3D NX8bQOCvfci5m+/peQDjvTXa2Fpww+1YLokEIV4ieKjVCn9M3oqhkmsCE4MK0ia6mEqi twrw== 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=k0cRgpglCD2PcKK9Njfjp9ahbK4mgT1ZXlX00pGzzsc=; b=YNdgVMUfkVemAuo8xXDXYziNdPOCub1XOp+a9ESSa4DiHbVIyCWJENuRi/Z2NW9x2T zdjGdn6jRbTjuz0DhhvbLJ7rpiZJ4jh1FLzxju9R6NKiUi2/J+8aD3lG/GoxGLF0neI9 gh/h3aeN1OMCgw2t2n7VmemCuewqDWfxi4a2QviiTVhD0xE0Rz64jU3VroCFISRfYGTW pZW30sde0eAE6bwTDsTz3wZsCxVvwK962jAW+22iX3JroDrN6v1tBdHjIQQOBZMc3Z+s t1ubKV0ZpoIf7jmM+AFK8Lu+OtciEoQXsmEC+cGvILZdl8gk1Mw0oX4T9ZBhI6RGaKJ9 yg7Q== X-Gm-Message-State: APjAAAU3nvxX4+7hBEfxo89pQnHmOxMzngTY8LTV/P9ykEhEBffjzM14 4cCMp5y0RLm+pG7FdyOfgv5FPw== X-Received: by 2002:a1c:1b97:: with SMTP id b145mr65323798wmb.158.1563878511302; Tue, 23 Jul 2019 03:41:51 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g12sm59382890wrv.9.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB1731FFA3; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:06 +0100 Message-Id: <20190723103612.5600-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::331 Subject: [Qemu-devel] [PULL 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: Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , 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 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Jul 23 10:36:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169509 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708189ilk; Tue, 23 Jul 2019 03:42:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWgEiHQ2dMkI2S1oVPZfxIFSH+65dXCa1kK2Em4/1Q0H4Q8eFKpKq4Knu5netcwZJkD0N6 X-Received: by 2002:a37:bc03:: with SMTP id m3mr49699028qkf.199.1563878557959; Tue, 23 Jul 2019 03:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878557; cv=none; d=google.com; s=arc-20160816; b=N6UyBT9CTfp9qoXvZCmT1upWDVBv63T9+1KQwfVEcQNxYK3fMvvZOceavGixKUGO5X DZ73V5tpuMJG8dcfxcmTZKcSBI0ee5Q50qxGeklC5/9W1OlGz1sY99Y3LDglPI3fVWQR WwZ9OmB9ghAPMPLXvHZqixoh++zMP48sgizgN7W8HIw/YDQI24LLwC2tPRqmlwUjJgFm pBoyzGVpI1vkg+VHzitLXYza6tLgA7cunbhX47IET8V4sAHBDyGabeeUzQTRIiDfbX4U zWNNq3hqoEGBK/DVSeRXkQ78P0qgMuxHk0GnGIX1qR+3tcb4QHKiSL4rAHcf34xXQUcZ oPPg== 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=qyLKSdPX2WPchYG7C+FRJEUvyrp1wUDqLHouafCL0pQ=; b=uZCqiLcn/mkz9vdm50eOiuOPxM1hf3GVrNndNGHm3G127oowFXuS/JKdei6F1/mafC 0mBqZ0/MWPlDsXgbi6I0R7Y3AYyN+n6wuw1aqG7PuO7CdnKCIzWIVwGnMDNx4wsohC/t wZbIQT9TDjZfpYmf9MxRmx/8mCuD6O6mghKZGBHs6ZkwutR6twEGE2oPi0a6vrlrfucc lz1KpKueFUpxByfpr9KTj7abk3KNhNdnD9sHDiloMLfc2reNDzAI6DD8QkwS2tUXDLpA eG42QQjqzVMaSEDyVNvLPGOsfZqC3TFA1sP1zRRITlJGx52J/DcXsfQbIEVrg+LTapli o0Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LnzpAX7u; 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 a190si25913387qke.379.2019.07.23.03.42.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:37 -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=LnzpAX7u; 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]:41090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFh-0004rI-0F for patch@linaro.org; Tue, 23 Jul 2019 06:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39710) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF6-0002YT-Ar for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF3-0004ED-Vd for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:47014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF1-0004B9-OT for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: by mail-wr1-x42b.google.com with SMTP id z1so42591982wru.13 for ; Tue, 23 Jul 2019 03:41: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=qyLKSdPX2WPchYG7C+FRJEUvyrp1wUDqLHouafCL0pQ=; b=LnzpAX7uTmvpTDwvsUkh7U2Skevlqy17jKtsJTpvbEN4feDkVM0u0tQg5RWTwyowhD RcfiFVFUKa65W4cTcl98OKMC0K9NuV3HYrlOfCW65iCaBZ1ObddIh2RWgF31c7gRBD23 VYXiQXBunVYp58/l0KeILaXwaTO8a8V94gOYyOy4K3xNDAJU0M2GQO81OnErSgMRvzFR wpNraVej598AdNlWipkhH59Cb8TDYXIhoZwYAuznWW5Xl0y3+wvzqcg2+sVmfbvz8Kdu FwPRNnT4RuJT0COhdKcy2fuXk4pfiPB0xsXcJkUmpm5dJlhMHhLU7ZQMbIt2Qo7JBk4q qmbA== 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=qyLKSdPX2WPchYG7C+FRJEUvyrp1wUDqLHouafCL0pQ=; b=WoAbE8gWRDSQNUJZ59MV1HHNDYuSEUy7DrhUvOYEqYePW1fKYon0bJTTeuRIuq2Fpr fzEjgz4KPBtp0OODey6TkUkH6FQr45Ue4oCUd9gBbm3nvu3f6PujX1lIYvxcsHGNtgHR AwY4Ir+5C5Kg/JLn1gSlm2dzBAUbwiceTu+IfcMV8WCjE6X3cSrc+v07NjMyKWH0Envv 8e+WCPpTtL9pUjVObJkTgOdVFmsBxKy7NbMX8YDKQk9GSQPU1zPft+TbYzH4ryOLk07R B7siIz/FFJ0CtWrBt9qWI9tfRTfltK9d39JWzzo42G6TR/gu7no4OjEXAvIBjX8J+woj DXyQ== X-Gm-Message-State: APjAAAU7McqC51YRgWk8MKFMXp0jhreVjYG5dX2sM2y0AeHeV754vW8l kzTBomObpdJ4KH0XEDez6rFmGQ== X-Received: by 2002:adf:91c2:: with SMTP id 60mr23838509wri.334.1563878513884; Tue, 23 Jul 2019 03:41:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g2sm37766623wmh.0.2019.07.23.03.41.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EFC111FFA5; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:07 +0100 Message-Id: <20190723103612.5600-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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] [PULL 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?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Jul 23 10:36:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169505 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707567ilk; Tue, 23 Jul 2019 03:41:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqS53gfPC18I8eBfm4RcRYYM3IdmRXpwTVZrGytGJJeC8pwjSWJHzMHJ5Aqr+1GO5/lks7 X-Received: by 2002:a0c:e508:: with SMTP id l8mr55587869qvm.198.1563878517374; Tue, 23 Jul 2019 03:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878517; cv=none; d=google.com; s=arc-20160816; b=L7wGVp67njMRkPCo1jIDPMrcJqaLQ8O5UkyxN/j92jQxVppal40DXIqxaUH656ksMC +TU9/Bi2q3726yF6Ax/o7wq9RaNmHhppKXyR+oXDr1KBweLZkuCtgdHWCj6WYio0OT9B xYrtC5kKIFkyg/yHrshFYZu9B/0g1iLpoiV9Pq+y7RWvhV9Xx/dOnGN/lboBdGxk8CVq AVshEXhmpPpp2zUoBYheiAvVdKbA4E7Lw5sPZtIjbcnrrPPG/Cr8/UidqwmnjB16iMnp hp3Rjn0BHb0sTgUS6Cf9gGzU3T1JL6+GRw+AEWaI6QVEeZCg3wcavaDUaVfqa40OElKI /9Ng== 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=xaoZEvLN4IL9Dt8w+scYYy+PugidW1l4kvvMHsOXzQw=; b=NvnH/LxXSt3ic3714RYN8jP7shGRk3GENFyZj1aE+X9Ori3tJy++DyZcoULAj7GTs4 fJqIj36+zH6akIh9wchqfWKVo8I+cNEq3lWj+eAeRBjYb7pbpj3vQuT0GK1b+ERnJmTm eqtLhPFv2W4WpvFY7LfK3LCrcoDy1yoBiMGutpAtpW0srFM4a9lctABKCzjgdU4DvCHg rfozF79HaFzltvMuLkvAwUnyRg1TND4kwHqNa3I1LhMQRN3fJoKSlG/3OBzKzRdfuFr2 xnHBOEdr7ASkNJG9vS3eBOn9jNXP8iKTJeYRMHEEgrI3s0jffzVbRh0HAZpS16jaz88M loxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X3RIdHG5; 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 r28si29464020qvc.33.2019.07.23.03.41.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:41:57 -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=X3RIdHG5; 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]:41070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF2-0002Cy-T3 for patch@linaro.org; Tue, 23 Jul 2019 06:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39606) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsEz-0002Cs-LY for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsEx-000494-M4 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEx-00047w-Dp for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:51 -0400 Received: by mail-wr1-x433.google.com with SMTP id n9so42701142wru.0 for ; Tue, 23 Jul 2019 03:41:50 -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=xaoZEvLN4IL9Dt8w+scYYy+PugidW1l4kvvMHsOXzQw=; b=X3RIdHG5aIpTTYg8zSKcH8ADDJ/41HKij53VpMtS+vv49SxNYelzSh3yMLGdYqcGu1 FUnEZVMIXxPNTUK7r3cXdfgVSejp4Le6E7g5iYJU2MRPagO+neFMf04RRI7RQJZW2/RR OMvfXPpXfu3UEo5mwdN+SdHDUjGoBts3YD1m1vyWvfZIX9kPLV73XE4iamrLAfg8SHsZ r8lZ492t6eVl0FGf773Tqsm3PK7haGyYCC+1P3s+zWmeDklu/Uvrne4ZpatSSJSGtBw0 2qKUCjWw1r7Gd7ygTagW4pxOIt/VGNxYF/PYmUGuk1OzaUhtfVTxJkSCZ1vWT+l0Mb+X F6tA== 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=xaoZEvLN4IL9Dt8w+scYYy+PugidW1l4kvvMHsOXzQw=; b=Z0U+jG4P89OyWKuOhnits1a7MBGUumlLVwSfM5ITc0o3tGyk4WLwvhvK55X6/jskuq GIFCP83L/aBigLNtrAc6r6vP9/P9fo7Dzfj5L4m1MZAOrq7YQnSiV67wqoPykJ46JdhE HHHLVYw7CfwPugvB7x6OAs62+yO113LXGHNAw3R3ToiE5v6xQ+FdIa6lCVt8kWALpMYk kAstVfprujBNzNxzDQc7Y9wZhY3U/ETLR7844aRJrruVNDu5UbFGGBwPI+6G+uYhuTz/ ZwMiEm+25QNfnA6ZYlgDzL9y4Gd4UD3xADOm+SwTZDBqlEqVYPhqwCCobqQwUzKltqtU rFdA== X-Gm-Message-State: APjAAAUlh2yucgO+4zqwqPybOUJjcvSh5nG2WLUt/qouxjaG0Mhgpx5l dVl47Q/sRyRiwKSVWywzr9g74Q== X-Received: by 2002:adf:b612:: with SMTP id f18mr70121603wre.97.1563878509818; Tue, 23 Jul 2019 03:41:49 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c7sm35490750wro.70.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0E9671FFA6; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:08 +0100 Message-Id: <20190723103612.5600-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Jul 23 10:36:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169508 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707837ilk; Tue, 23 Jul 2019 03:42:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwp81YPoZDsq5RzCHSu1bl3+T9kf78TTFdMlw9XwULV5Zq3fdIMQ+anpOL4aHBsKy2+3Ttq X-Received: by 2002:ac8:2a0a:: with SMTP id k10mr55012572qtk.148.1563878534894; Tue, 23 Jul 2019 03:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878534; cv=none; d=google.com; s=arc-20160816; b=rSRuU7zq1q5L+J6ii+gHgpIw0C1hDCW0xfG8MGAB9IIrBpQgEwodyHncWBy2WEZEY0 DqeYvF0i8rHrr7NgkglRG1EgZEjbx/MrvLkKGy7meZFTgoWozXPDCB4BC+y8/shyJyFX gStn7iGAR0t0jdTSctZ6WgMSoZoPIhn3QeCsAf0d1BA87ESRnNZCwZo7EMh3QuHVH7rq 0dfu3tMwu9tqloYEvcmqI+f/WuHrCtWdc+cE3Sho+JlBYlzrQsZuuw23a681pYW2STqG cAwadf7+bapzY0qWgBuv9EMR4Fkh6PpQorx3hdi/KMw/wZ8PVb4Y+catU8h7Jza9adkt wCLA== 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=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=E71V0lJJug0VEdYBBBgdmqacDaVC1kLmTKyfu9gM6CA8HKkJEnAymh0ZxyJjtEUQN1 R5q4ZysPjdhTSsB6ZFje8UwXZY/5UPh0NRXZHIps/4b673hA8dvcoNpXCZvKIb5AXf6h hYns5HNHrCs1Mbut22zAMQmAjSUAoZnlrN9nqi87rYfO8uyf3U57BNPAYncwj0CwXzVo tx2R1IgCFiC9sIVhqI3Md9sco6nUx/tXorlYiaJ3uADpgZ19rBGzZ0TO1gfCE6OSligA o1KiciWS9qBMP6m8Y1BkyvOKSdmzUg+UOVJ8vq+hIbYEqQo5TjhHsSYxZ7D+eWyHQcwf qB2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wRylIbBK; 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 l4si28530374qtk.337.2019.07.23.03.42.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42: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=wRylIbBK; 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]:41078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFJ-0003BA-Nt for patch@linaro.org; Tue, 23 Jul 2019 06:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39767) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFA-0002rp-5q for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF8-0004No-Bq for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:04 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF8-0004Bs-0C for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:02 -0400 Received: by mail-wr1-x42d.google.com with SMTP id y4so42643517wrm.2 for ; Tue, 23 Jul 2019 03:41: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=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=wRylIbBKsXBYTEcXi4fMrOvUpPwGx6YIalHlWc6iBc/xW8q2SrFKtJcs0U11MPhSyR QnkgvCAHH8BkSKMeH9fXYquRGPY0BbpI9yIFohNIaLjg80w8H+GeWMy8GBh8HjFX/m1T RjXGSbmR4kOxpO9pW2ewGMdVPXymMRU8SlWH+sH+1RnAcEmM8cnvMJ8X8VDYj5Q0Slcy jqq67j7ytwD/pMNv2EuKjlJwiW1grV/6GHcp2/kL62sRQuERbS96OkXBGBX3sg7nEmEx MBTRINg5aeQstlJpABq3df0RRwfNn7s3NxF13w6YLqsueSfK54KwMLSGdhl/1VukriTG bOpg== 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=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=GqZL6pv5IvyYn8N8YVnSxfxCReniOer1pSWGCfO1LRzD7R84lggwDY7kImhbHDRKWu Fq7vyyALGNemwf9A/9sjz85n5tY7kuXAm48SP88ejRdcOlKzijLJIa3E5QtK053JuBSs nmGrDZE4iBgVfkJmLdTIia/3uKhTi2qtlv8iVUHnbq8mtjn2Ye9s7QzQLUeoT7txMZeO kxoIsWNuvJcVQIDAE/ysGUO6IMv0Kh0WYwJseqsZOd4RpvUkiCLDurxv5Gsg36feBYHq mK/v8nF0QIey20USvE6WDLzmwcLgHFAACXOq+oWrVz7kf/satxjt5Bj+Ip3FjrErQNsY lgAA== X-Gm-Message-State: APjAAAX0k5CXkmrKaSu5nqejxTKPrFxKs4B51uKu7PNYMcVtbKwVH2z8 fdDRwUNrdH4li89CPn6ooOMAYQ== X-Received: by 2002:adf:fe09:: with SMTP id n9mr84665697wrr.41.1563878515157; Tue, 23 Jul 2019 03:41:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o7sm14676591wru.58.2019.07.23.03.41.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21E351FF87; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:09 +0100 Message-Id: <20190723103612.5600-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::42d Subject: [Qemu-devel] [PULL 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 , "open list:Block layer core" , qemu-devel@nongnu.org, Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= 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 -- 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 Tue Jul 23 10:36:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169506 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707677ilk; Tue, 23 Jul 2019 03:42:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGxCOgCzVCx6On6mb4wauPLPMHox93L9I/RkY4SKydv0ArWEnydWSwqRsVO6cZmOZ19Pyt X-Received: by 2002:ac8:34aa:: with SMTP id w39mr53794390qtb.118.1563878523594; Tue, 23 Jul 2019 03:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878523; cv=none; d=google.com; s=arc-20160816; b=howoR5q+N2KlmSWdQysjB764Yle4BH03iI3pfcS5JT+hT85Bo/uQ80H6JKkXFxRyhQ L6mfUOsVMsh45+Fba++zX6Agzx+iXbVxhyu/wMM5rNsujtA5BAjfHfGK+8BqBf+kqZz1 8ZaL9yrpgLwVJvBzCi9D+t7JTXWbBji7BtDn2AyOm0Ly2wE/dbqPapXNHaD2x2oHjLY0 g3mt78ayPVCvRVkvSWup6kwotK1iSBga81X3HbphO6DfpNvOC24hO/e0txd5Ik6VVL60 Nj+a+exbgHqqfjUwiNO28xpbZAScxT5UynCxOl0OCQvfhrEbXpejPMvatCmhqsNe0Qp7 ss9A== 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=7RSktaeaWh29DL6iluSfOCe01Qn4jt3vtBzbthVHEtE=; b=vHppufkIPIbAsWMB9xljCInRjLEqKVQrGUROOZnNdsxDRdrT6UR52OoAxiIz3VACQB ll6XBGNsUAKFyL7Wy0IG1zDCHvZaxwBVgBrmkcVtLNEagRXIusFfSZxv7tc6usAt3gCw /qANpm8IbByr/OfXko3oqdfrNitaepdLTox/CXbu5PWjUhPZxmEJkIMbZQiDjrPdlf7t /KFI+9CqcZMJ/Jv9P9UNyqlvIYZYCBRH01TgO5QknFi7t4vy8ZSSuRqua65rJsOvX0nu FGZtK7ryof3N7Z66pCnpUwNu9OpIi8HShMPH3TvtpsWbCMy8bCe2i/1Y0GJa5t6jbQhc ftFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eskZnw92; 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 36si29532555qvx.32.2019.07.23.03.42.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42: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=eskZnw92; 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]:41073 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF8-0002ST-GS for patch@linaro.org; Tue, 23 Jul 2019 06:42:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39628) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF1-0002FG-PS for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsEz-0004AO-Jw for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:55 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:33987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEx-00047b-Ih for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id w9so30816838wmd.1 for ; Tue, 23 Jul 2019 03:41:50 -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=7RSktaeaWh29DL6iluSfOCe01Qn4jt3vtBzbthVHEtE=; b=eskZnw92VtmI5Tp2DTPFIm+GO7posbdhjfIINzDzDm3MWZzqLLWjkKU2W6QgBZKeg+ xq0iwgAFuQ4wHqEhGoTp5hgjlOKhRf+i/AsQ4AixF2vKx4v76UhN1cYUQmYk5JlFkweB d9DgueNWkg+FjxDMKNqW3VQtBWDEO9cf+Dm+YEtPoS+qsV4HkYfnCYHROGQaVTxAG2At fWX+rXM4KvuvDO0wZaw/J/K/yvRBP3q30N/T5wFwLUANNKmbJrlot1YeoCF2gqIJO/Qn kEHUT5plXTnCN54w9buYu7SkWIerQgPV9wprRl/SZdPPqd/kSFic3G8JHzvW7wCp6sEx 5dtQ== 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=7RSktaeaWh29DL6iluSfOCe01Qn4jt3vtBzbthVHEtE=; b=I1ERg73OvBkq6Jh0ja38c+CJTZpZDDAHuEujyRAI8tGpb/eo5Hnw9SUejJncFGUPdd wIHer2mgSzxtnMeTyV1GLvbC8YxYd/VxPt2NrQe5dHnr1qJJcQPanHreWgqP/zUKarud Z4XvBYTAAFsCxlPbgWV5f3R59THZfvQBtfLNJ7VV3ZZrmR2W2rWP5PUUqkX4MmUFwflV K9S/wrjqYLq+MPThI1wVDIkRzXSjUHJKUoDjfnrAaFzulgcUQ2LaW+puZEGwM7BaxijK 9xNrvOYIE2lRJwGy8z+4I1oPtdKbH1VG6Ky73EmKoZ6MKPO7qVwZpNsC/9OM7jPbrHCt HUHw== X-Gm-Message-State: APjAAAUthMLN5AEApO7Z4cRsqIvN6VtITnL3tfvW63Um9PbGEXwpn7X3 JMZsLGF9Fyxx2+s3SCwrUfgpyA== X-Received: by 2002:a05:600c:1008:: with SMTP id c8mr69167327wmc.133.1563878509418; Tue, 23 Jul 2019 03:41:49 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t140sm38037897wmt.0.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 35E631FFA9; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:10 +0100 Message-Id: <20190723103612.5600-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::331 Subject: [Qemu-devel] [PULL 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 , "open list:Block layer core" , qemu-devel@nongnu.org, Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= 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 -- 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 Tue Jul 23 10:36:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169513 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8709053ilk; Tue, 23 Jul 2019 03:43:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKrk0nhhXYN8PMsNmyJvW964OvvxuKMIA72VMpyxUqCTFa4lEFcO+MOhvX187rjn4gJY+D X-Received: by 2002:a05:6402:54d:: with SMTP id i13mr65487965edx.244.1563878617230; Tue, 23 Jul 2019 03:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878617; cv=none; d=google.com; s=arc-20160816; b=VdBISCbVmDwzbOmxgkCQxoSZjbVW3GIF5JukyhiL2k6JBhhN3bcQU5nJ/jUgUJ+k1p UwpqAK5GjBObX0ComDdOE6N5g3HixuvX/eA6TMnQFEWqaaSA5I5/scT/jjZao16lwyVR haLEq4iov2lQq0g8SIkdJWEEZQjcd6idlwb8pQ28Oc1VW5c9hmsxFh44KtYlfbGbZe3x TI0mlr5jmXH0DHJJwJUgD2AGIq8sYL3bbo9KclO5zCog9dSkPmOMbcUjcf0b9G/eyUO8 gB1bApnr0Z61XANSQ0hqRAPyakeN5n9avh9+PURbnSPbn6wwthBlnT0tGgDavnwZ9+Yz rKKw== 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=P+AkiWgOwKZ1xCT/g5RPhLJYhV52/2n2S8V90CRgCWk=; b=Z+99qJnltik0RnKTlypz1hrwL83ldn0qns7Ik9kqRohzA0/2YYGyZ4EsYwcNOC9mmy xHnxXH56EXOnpBQD+fN456J2PN+rg6sndl5wCgeHQPzc0rtIRFaV+hBFKusROePT9/mM xzssCb9TWsI6LzxJ7sxIclaVjAoOVRIyb6nDpk1+klhm5aqeUnqPrJTyc5nBHfRfO2yz JqWuc7ey6sAdUvfqA8tEeQ2wH3FGA/eR1tUaJP9Hkvbjf3mI689hkrSdtErM3BFX7nev 8Js9qtbquHsqSOZ0muZQKj4BGPRAL4ks1dXIokbz7UmjrjjfBr9Oz2RuwoubLEzoFnKr ngtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MSqoa7a6; 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 w27si5619344eje.261.2019.07.23.03.43.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:43:37 -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=MSqoa7a6; 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]:41122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsGe-0000VM-64 for patch@linaro.org; Tue, 23 Jul 2019 06:43:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39669) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF4-0002PA-0u for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF1-0004CV-SN for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEz-00049f-Mr for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:55 -0400 Received: by mail-wr1-x430.google.com with SMTP id n4so42696076wrs.3 for ; Tue, 23 Jul 2019 03:41:53 -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=P+AkiWgOwKZ1xCT/g5RPhLJYhV52/2n2S8V90CRgCWk=; b=MSqoa7a6+VitNCJNIkf8ZJ79pdMB/vcNY7xmw9y/32OFTLNECUTfhhbv2Fk/IL0s54 p06+NG0OxcdK0PS9u8OjUJGehII8senthBre4JblKVOzRS+TSQhWqqABLcAZatmsAa7A w9+bqoFP1JRjcyJOmz81x3HiOkPQa1tvUAM+G03NYGyNamkGr2tg7TstOYJg3T4b858R 8KyImdDKtrwPg5ZHAISY/2AwrjGxz/v4hy4BJJ9/ccDyyxAd8G0INZ0wtYDmlQWB8Qab s+pmblIVjccsVIzFzVq/qyy3I7HroxkLY4WQ+LUgA0AeqOuI82Eq2sXGwRLM+ftAIgBK Z3vw== 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=P+AkiWgOwKZ1xCT/g5RPhLJYhV52/2n2S8V90CRgCWk=; b=PRraOXNcKRKB6fEZr0PooulKPzi7TUdTFpDXNVy1zNygyKG7jpQtuDzeKY7ayKQVdX yKjZRpp0a/lOYpzl+Kmaiglvj1Jo2B0F7H2Qoy0Xu+0N5EbI0IVs7tUpGfSY1Gaz/Tx1 1B60yLOXmOR7zFDu7M/hmDZ8dyD6UK5u0k/Po9JQ+LTJ7/2x5imTr+VhBtlF2W8plOpC GJlDICuXVnNNfVmdH50gRx4BXUykpug7eXfeU5SNEM5tQPD1RWypuVIJtjI0Zd1va0Av T5yDKgmDGSatmsW8JgkcisIFb2WFJMdiVxgpKfnvq9KcbyPpYqShSpx4XoTuVLWcQsXD InKg== X-Gm-Message-State: APjAAAXZY7RwT6+KnaSufkmWXNqbhAnWhocuW5HP/j3ILzeTCQGDHaEu MblOVUwbdTxUSmDf6BwyMouU9A== X-Received: by 2002:adf:ef49:: with SMTP id c9mr4642277wrp.188.1563878512123; Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t13sm52112246wrr.0.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4DA8D1FFAA; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:11 +0100 Message-Id: <20190723103612.5600-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::430 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 Tue Jul 23 10:36:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169504 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8705075ilk; Tue, 23 Jul 2019 03:39:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzL0BD8LwsuDZpuhUhn0S5aPJQuLZOR2y3nTevEuS+eQTh0MiARj+Mc3i7ZqKUv7Fvoh+V7 X-Received: by 2002:a17:906:fac5:: with SMTP id lu5mr57755737ejb.295.1563878341117; Tue, 23 Jul 2019 03:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878341; cv=none; d=google.com; s=arc-20160816; b=S3z1Tpq+u49PgfeORWaor8MI8dAnap7SeGNxm3JRQZxNj9bPVjRXFZt2IZ7wVVOR5J Hd81rIA6S07HGllaXziQMhS58MMiCgcLLAcN92wtZzO0QGGsR0Eoptkm531fzbrT43Gy y9Tve7LqydxAo5zS6GSS6ONhGmtoEwAfuEehmTpDLPnrl/rMRSbVUU1E9/ka5mEWU6FO fPYuUS17Hq0BUazYEZqQTLE81kMbT0WfnQHDoyY2HJvS5EuO1RH+SccD86RXnwVsat5P WZL91sMf4wKLyL3acXPodA2mmOg+IZCjApE2pULE61dYnjlGD6jE7xGBmvv+DO/AKbzH M3Qw== 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=JMKdIh2g4fFAozN08FjAe0WwG5ZoXRsvCwFyQU3g99o=; b=p1uWpSBUF3PlE8KTd0D1mOub7dxrG9ndg62FYJV43pxWQTFG4umbPfmxEKC7V4oQY7 uVGd/wLl4SopuvQ/bGUHET7wrsEum+ckIIbeRcRnrQijwy6xRYzvH50i4sD6mtTYw7Jq vL0qACZ/S477z5xqGGYLhfpTV3E9AMog0sl/pzj9nhA0A+5tyR8bPYegT0NBQpBNNjY2 lmmBkbbhc9Mj+wC0HCkYAoZ8sm47bGWA8u2OmF/scAPoIKTnjirz9819vGHaoylD9r55 wsLrjesv6aR4xxtzVRodyPuVHT8usg98hrh07jw7cHHGHxvctecpyYTEsT+App9OgU6F i88A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="G/WCn/oK"; 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 g11si6735703edy.432.2019.07.23.03.39.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:39:01 -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="G/WCn/oK"; 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]:41045 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsCB-0008Ew-LD for patch@linaro.org; Tue, 23 Jul 2019 06:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37911) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9h-0006CZ-UA for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9g-0007TJ-OJ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9g-0007Sj-I9 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: by mail-wr1-x436.google.com with SMTP id 31so42646348wrm.1 for ; Tue, 23 Jul 2019 03:36:24 -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=JMKdIh2g4fFAozN08FjAe0WwG5ZoXRsvCwFyQU3g99o=; b=G/WCn/oKpEsorjpZxDmSZANa7D5EWf/oJ9P2BTlyDKQkQI3/bINkUTlhgVAqfgSGOy nIkLUMG+wNQeEjaz5wS5TL8D8HZickanwUGOG6+hEDHrDhtDPPwpcVPktMhhiQVRl9H6 wDsHPBheeIU0I6U3CUR1Li8L4jmqWTpQqun/mrYk6aWZodwXAgNuslXa+tCBZRaj/a1v SzQssTdKZ9/D8ZgYBh8LQggcmKL6XizQEMuWvlJicm0LokphrlTyhvcA1Yh1Q6jOhEC4 PRju+v1WQDJHXDCvviJwrMXcQbkj2M6R3t3h1OIs2zET7qVT3xKhf80QaVS0U837qH1C geRw== 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=JMKdIh2g4fFAozN08FjAe0WwG5ZoXRsvCwFyQU3g99o=; b=AmwZc5hfWKSqoQ43CUXto6owJiNNB5RF4WRPY/Qo2JU/OvhO1dFOeGdS26Ja7r9RfL QT7F+XpCEqxgnzJG8Ax8kJm0t+5+TJjl+l1lCXtOP1QzMVdxFV6i47/2Iz2vTW5I0vZC MyMaVlt+x2VNBV42gohUJkQ7YVGxz5QIQBEKS/+CjRqBOXb3rDx0m/P7J3b2QLb/hdAS JhRu/+yAJ4KkKI9QgGw0nE/PO1aeeWI3xZ6n6e4YzoaxRQYY9oEEUkZvxf7wIFqSSshy nckFiJU8OubRNnZX1+ov3/vS1NuR6eyI+lBxTf+hgWzU74yGZwZ4gKDnAFzZj6/N1y0w NObQ== X-Gm-Message-State: APjAAAWVS1SFr+1aNRKOI1m+8KjfXCaWMzeVWiKWZpBlPdrrOiNck9rA 2Dy0HyRClg39N69QpuMhcyslCvuKnrs= X-Received: by 2002:a5d:56c7:: with SMTP id m7mr4985394wrw.64.1563878183343; Tue, 23 Jul 2019 03:36:23 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s63sm35358934wme.17.2019.07.23.03.36.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:22 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6200F1FFAB; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:12 +0100 Message-Id: <20190723103612.5600-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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: