From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371048; cv=none; d=zoho.com; s=zohoarc; b=GXKDSOTEAtGuwSYQwSHir33sfEFAtWnmz8BWyebWqy1LPL2maCNDDEfuUzgfAvmaMAbun6ZhWmRKfVfw/6eq4JkRzfl0UpwffK1l+IX7DT2OoaHQQP5LGdsXphjNm1lqq1PG28MaS3+dqhACv/75msRBWet3U8rqJq8J68sSveM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371048; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=RVEBMRYTG5AW3LbaqnRvBlP8IVUCEt7IuHIccI7MBVnUjdKkc12lOy160wUFRcINbfGj4+9kKA7s4nybl4ufqrGfnWMiJNR1oaiS+57fT/TnF5oIybYBX7cy6VrSVZBbQT+nHoXXbLoqSrQdn0xAQSzNIok3NhUW73qm3GUsCxY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371048398298.08790026809436; Wed, 17 Jul 2019 06:44:08 -0700 (PDT) Received: from localhost ([::1]:57264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkE2-00067z-MD for importer@patchew.org; Wed, 17 Jul 2019 09:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55252) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDb-0004w3-Ol for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDa-0004So-Lb for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:39 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35520) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDa-0004SC-CA for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:38 -0400 Received: by mail-wr1-x444.google.com with SMTP id y4so24909492wrm.2 for ; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15sm38821810wrt.77.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB31A1FF8C; Wed, 17 Jul 2019 14:43:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=A56w0WBTwgshw6Om7Y2cfUU80UEmSFZ0UoHQKNF9MESrLucdnM4yVB1S3yokjNjdZp FASVdG3kb0JM8ftwcHR4rllm13aHqQ1NrzThD79o4OY17AxzD6mW9oyd64Xxg1KE7Pi3 Nqdqc+pV0hP6Fd8K44DITEXX0dehsjvMpHMU6EA22njjjketYCKWX00MbY0NjHi39zNG 6VwfA4hJXKbWrQGx14GvO1zJelVnAv6gX25y1KP7u2/CxtL6cNbUpK/UnD7y4D5mzlCj ie3ZDB8OxQ/rjrHGAP+RebmKiBL96oNCK3Mf9K10nwMo/oRQAppDLTi8t/q7C6xbP3YW XhTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KXyc4gTTAJaNXf6dtEqbxh/PAibemTFL8L8bZEMcnns=; b=IWh9slc9trZdW7d0oqQRpeH5Jcs+tKWrKgv6RXLhgh8iGqZZLLqUXdcgxoCgf8m1qB SmQXuuvjHnpiUBIRPsQge4UWgFuUEevAnFnjtt3IQ6UL09FyC+/dUZgunRZXvuZs/Nu5 m1NoH3bgGsTUzuGnQqeiTTvSPCWeJEFLaXVXUIzEsI7OaTngHAfLahpctpG6nU+G6ixj fBt/C8OqrnRwB+KpJ/ktgwHR99S2R/zpIa0/nEyAZqKKiURdAna11B52GTe1D1O7uQRk bWW5q2gY94sO8zKIEjkzBZQAq7kAFTlflCTqrxByTbxgI3H0Mp7eCoXiLXxYDnBJpjME l0Kg== X-Gm-Message-State: APjAAAVJ8yb51Dh+ObqBfWjnGQsTXO4yMuS5UEt0O0IYJy8dsUpw9dLR Gi5V+QG8tQATbCavHspKEKbBYA== X-Google-Smtp-Source: APXvYqxCQSa5fCA9MuB4CmD3f4iweRuOnJoJ+/TzIYxrH7TTumh0QKBwdmi/7AylGxora6DaAOd1bA== X-Received: by 2002:a05:6000:12c8:: with SMTP id l8mr44708060wrx.72.1563371016856; Wed, 17 Jul 2019 06:43:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:13 +0100 Message-Id: <20190717134335.15351-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 01/23] archive-source: also create a stash for submodules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 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=C3=A9 Lureau Message-Id: <20190708200250.12017-1-marcandre.lureau@redhat.com> Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- scripts/archive-source.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 =20 -if git diff-index --quiet HEAD -- &>/dev/null -then - HEAD=3DHEAD -else - HEAD=3D$(git stash create) -fi +function tree_ish() { + local retval=3D'HEAD' + if ! git diff-index --quiet --ignore-submodules=3Dall HEAD -- &>/dev/n= ull + then + retval=3D$(git stash create) + fi + echo "$retval" +} =20 -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=3D"$(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_fil= e" + (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" --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371087; cv=none; d=zoho.com; s=zohoarc; b=f1jIyqoJR6ziQPRpx0aQVWZDmRJ2+nuVHXSYlgWn9U2jtX9wurQcG2TZfj99c9QOOYq0xPX/nk3n1PdwN7DqW7gkWOCFW4Z9V68BrMZsn+WV1A5fUdY/PihCYdlUOkIrKNyOJ4YY9iJOVGEt2zS1AJhrehoQmIMfG307r0ID4dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371087; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=BOi2knejRngcJSXhk731NEmWpyKGeSGZENWR7BVRjzq9nNX3DGpv+2a6kJ48GZieGuXaRnKFxfZUSB1CmvHSUIAhU5EVLYt+Xe+0uKAdyCInyPvCm92u3PuUXwz5aac+zcRITwAX6F+4/+d6E7Mr2kWzirxSJQC1URidlFCpbk4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371087210483.07416607070456; Wed, 17 Jul 2019 06:44:47 -0700 (PDT) Received: from localhost ([::1]:57284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEg-0000m4-5N for importer@patchew.org; Wed, 17 Jul 2019 09:44:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55276) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDc-0004w7-Ns for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDb-0004Tr-PI for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDb-0004T2-Go for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:39 -0400 Received: by mail-wr1-x442.google.com with SMTP id x1so9890747wrr.9 for ; Wed, 17 Jul 2019 06:43:39 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13sm29073077wrq.62.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0CAA41FF8F; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=aWJtlj4wopaXjm1M/W/X6lI5ZOzDcPhsm21UqkmhbqGGdlkT5zxWlXXEktCF8uUTPU EAQqEA67mJ1/OhJW7pAvMkDowGJVIUycjD5Adwm+LqUmWPeTpvaEBvrR5jUfT5NNdguy 5oh2elUKX+njaK18MWX2oOWS7erpBlWB2e1MfdxsC3CbxjdVwvxZILBJQi1/s0kjyJFP gJDdD4KtK64sQUty3Cfv8KbLT09jqpyOw93I9mTnK9OqgkenM45jjiXm6zlEolcUyheb cbVwH1+U7TaI8vYolINkZneti8it1kpVjytBO6k1UiiVJZ5uSd0i/wTt2qF4NlQIsOj6 Wpgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xLl357brlwo9X3ByorEBvzzqm7sZXYPRIFxQ86t1ckM=; b=RIYEOEYy2NBKUjTYrV90KdMYXPdsT2pGP/aLR5IqJM4xVclOobwP1perNS7+qRmLqL EHi2IRtC1KGRW7M5st2jBxoGRndIA4bsq93iRx13ohW1x4p/sqsHS45wqv8QlfJ6n7ym hgmZYLCSxubH++fdq8anmpzTNnBzAncJfoZykWdP85xXbmafY5WdrSo3RfdgJdKxd5I9 OnL0Ad7KOLxUA3uE/Jg+YDm7YKVsWU1+NF8YUf1gRhc5BDJ0GR6V34H1Gu+W0W54IIIw qERvOXPJpSVYX+64FrYmYoH0mIhsduQ9ZDLaF8DUZi4Jq+CfhFgGrfk5KTXM7HRTUC9d UABw== X-Gm-Message-State: APjAAAXMrIX8OhDyHjXw0kipHMm7yzvvztpeiiY6Y7b63TOHn6hvYCDy XRAkquXebaAqxuv/fH9O4qfboQ== X-Google-Smtp-Source: APXvYqzW56UkReIWdwvLiwioo06bUC7qNE/iCinb5FSSu8XRZCw5CJ9OTRd3VSBtWifDGzPmI+Bacg== X-Received: by 2002:a5d:6408:: with SMTP id z8mr28264608wru.246.1563371018336; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:14 +0100 Message-Id: <20190717134335.15351-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/test-misc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 tests/docker/test-misc 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=C3=A9e +# +# 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 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371090; cv=none; d=zoho.com; s=zohoarc; b=RKuPPosMxj0tE1BMQVUmut68iAf1bgQwmyxegHtOm5tAz4LIQ8m3lK3mWVox1y8KVhlmJrYWRPLt39I6qqrQ6zQiw63NH6n28z9e2TJgU/8BrWPJxMrLKCmn8A35pkPrmJC2PVI+UzZKiNJFu+5ktZXnAAfeJFaIXDwON/aTsvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371090; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=B8bWpGQdJO+7A3Av8VIYnb5f83V55qc647b1lO4QSWjZWmCLHFZu+JJ/UTQSlB8k0BFxy4F/k6H5wsrqEmowZ/SibpEHBOVRZNsqFwj0SbijzjYVh4HjUxYuH31teAxTL4/PAoaNDZqHYpGAKGhQzqZyJBABisQi4aDJTI8mdcg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371090446427.5262322114322; Wed, 17 Jul 2019 06:44:50 -0700 (PDT) Received: from localhost ([::1]:57289 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEj-0000we-6g for importer@patchew.org; Wed, 17 Jul 2019 09:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55292) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDd-0004wI-CV for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDc-0004UM-9H for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDc-0004TJ-34 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:40 -0400 Received: by mail-wm1-x333.google.com with SMTP id g67so18123181wme.1 for ; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c1sm46381749wrh.1.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 233191FF90; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=Y1x8dG4Fv0KMiUJaOowH08wZEki84il4YzkGQO1LKdDVdXlAtMWO9RanUtftx02Fpm BotlKmQEsUZfj2HFxUST9R5TvQmZIfUKPrZhW2ayZysK8bJYzkB9QC78Mpr/Lvb1VDW1 8116Bfxdg92hNLVmDjbzD2bLUv9+R8axVzRKFEQuSOYD7hFOdmbqbys+lLi1HNsbCD22 TBo3+sNPqDlSOfDC+A15LGGThq4YBESgR5OaGzvtBz3z8Mzz2fLEKDFmGP2lPVi5DgtD SR+91qpi3iR2WnSSUheQnIqu/+E3muPW7hhnaiRC+vBc7VLCsI/RPpaI8OCGYcQBwmb+ 895g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NtTeI78xH8tUJdk+GboQTX8bIzoNGyDMueezw0Q9cwY=; b=HB2JwMJgjCeFSSLUEFRg6i/0LqstgAdrC9uqVr6QT3evo97nB7nOr4D5SWSyuKHxqP woIb0wpyRGSzqhUpK7GycHa4OH9mp4y9G5/kNB0Ta+/ZP9mIReeMU5s9C4+4kkwCQNpS Xj0H6Can04UjvV9zrbFPeIv12mhbulumkpcN2bpR5aRb4VA0xbifCS0nD924ahUuQa67 g7i1GWRgvaP03ZDSZEO8Q6OE6nyBlCKTwgZF/O1TvZCkGlvWdmOL08zs2Cx2FIApVVQ/ nmVzJN8sAJ2jquL6YW50q7fPx/r+gBwOPPbKKsm2y2aWPzg0CLFRrS/ytz2HH9hpLW8R rupw== X-Gm-Message-State: APjAAAWe1addN2M8xEhm1oGn7Gmu9ZRkkt/YeeZZ18lHG52oHdYnnKVd YCwvoQuuIkxM3Y0BwjcZNwDbZyGwBmM= X-Google-Smtp-Source: APXvYqxHdaF/TJl8yGKLAYqVDZfHBIvNqtnwIOdFY2sm/urH9/qItTji/EbQbMhV8FX0HDFTF1g8PA== X-Received: by 2002:a1c:6555:: with SMTP id z82mr37948391wmb.129.1563371018810; Wed, 17 Jul 2019 06:43:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:15 +0100 Message-Id: <20190717134335.15351-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PATCH v2 03/23] tests/docker: Install Sphinx in the Ubuntu images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Message-Id: <20190711120609.12773-1-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Stefano Garzarella --- tests/docker/dockerfiles/ubuntu.docker | 1 + tests/docker/dockerfiles/ubuntu1804.docker | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/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/dock= erfiles/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 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371061; cv=none; d=zoho.com; s=zohoarc; b=nOVJxL0W8IHXMykoCM3mwpAtG6Wuit8bVoxVzB0lmwvJpstA5NnNuXugMyCgukH5ZLy4nNDDMZoIjiYusAVoHFPLhMoL8X0LOH3HHXrnlcHM7okwbeExsy47A9YdVt6k3Ai7LB81aU8+QXDdCc1aenwJnUjlWcbN8dNemOoAFLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371061; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=gAjeVIHgK4Cyo6fS5FiT0QvRIva0n2BtArzYAd7NhC4zCkTs67xZsMoAgrvDtfPaVZqGzUCbOXYgJqA0/WnZwiGT35b7hApAc5RpTp4znDCVMLVYgUyEUdOrOo8ltnSJd8ljQEZ38gfhB39jWKWb4gC6htmFefwM8QWA5ZZ+pjw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371061145652.2328773863542; Wed, 17 Jul 2019 06:44:21 -0700 (PDT) Received: from localhost ([::1]:57266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEF-0006zZ-KN for importer@patchew.org; Wed, 17 Jul 2019 09:44:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55340) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00054i-Bl for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDd-0004V2-65 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDc-0004UJ-VU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: by mail-wm1-x336.google.com with SMTP id w9so19215547wmd.1 for ; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10sm18954123wrt.49.2019.07.17.06.43.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 38EA11FF91; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=POiI6Lg08KhR63jgO8j8bxe7rhL56Iwz9Gop07AaFbdgsyUYtma2axQoeP6P53YFsZ kSXhDWgzRCt579Qu7q9+0iFghvjWTUQ6er9RRsoV65YNWMmGgNEX/5Mdkp9PfudPMk2w 91XcOY2OM9fZGwCEWRzjxBO2oLvZ+qMwcIPfrV4SdG/45oGlNY3UA+7qhvuqeKknqTtt LUwsHcBBu2QWNYj7ltUmv1AWzxSbiM4JKhKRL9fdV5J7WjqYhDQib7BQ/7oLpsyrtmRg q+Kk/7TVFLYXIcvB9ej8xKaK3ybVPSAQRBoogXeXWv6Q0tzlxjHs3a0JYbmHqgYI3dnl hJ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eRmhgYLbm6ZQVE/5wpa9qXZLrenpDvE0swt2uYBp4H4=; b=VUBFShz3P1+1YJPZJNajT+UOX/MAaCnNQY7epl0y3BsnzNqJoPPnURXCsEFyDlATLz GVmyTJ4alt43Q54mbVVJ9W8UVDGDbMuTkMjwuIOwam51OHAumY83o6prrv9R1C9nlRFi RTl9vCxBJ8G4n9sWQcf6JkeLDwS0/x6Gl9SuzA0C4y4mrGpi9DVzPPswNMzQJMKRWkYM G4+27Qhfs4+mBDDDmeKbO796R5PyX+YWkADRNR7sjv+e7Af4tpPVd1zTOJWJ+mDom7nz 7JfEpEjL2WjqtzNs2QDoTysCp7ILmGPZVUc5DcweymkfV7QY7JFrdKNGtkKlRbHES/xn DbmA== X-Gm-Message-State: APjAAAUoHS3VMyGxgCah9nqmCHJykrYRD/2XjSNpBE8VzzkKYpuCnKuL tqQ6PFkipkT2j65JnOQc2e0W5A== X-Google-Smtp-Source: APXvYqzdHAh7KvMHF3UsYhkcA+4fACDLFPYVxfsYcI2FgDTK7LG7JPKHgj5jc3LecengsIH8tnxeYA== X-Received: by 2002:a7b:c313:: with SMTP id k19mr35434413wmj.2.1563371019739; Wed, 17 Jul 2019 06:43:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:16 +0100 Message-Id: <20190717134335.15351-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 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=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/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=3D/usr/bin/python3 =20 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 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371100; cv=none; d=zoho.com; s=zohoarc; b=ohSj/gO2OYpn3ppI3BDerOgjw9ddN5ircIV5keBDYCmgvcEqu9J9nrOlM8mvrKs8jw4+AXMx5B/l/83KHeusDiIbevWmgpF1Wc+zrcyPaiTOgfq8iVpXbDx9qCHcvQuxJ5AseHEUfgLBP1qJj7YH1v1L1TKJ/pok8mVsmy9qLmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371100; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=QzpjCWC3phwLvMj6q8DiziNRcaNVCSLWRj2sDd7fDfioRVR27b2RBuDZPZLXrJ6QZEXYY9+MSIFmWpmcTjTU51pbsFMR3adP39RxhuSq0CVv8UFQdxiEC4F7IZkKVP/YoB+I/wCEkXmtWAj7AdUA+15hOmfdsclO+5M88ijHJWQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156337110009795.2180404673652; Wed, 17 Jul 2019 06:45:00 -0700 (PDT) Received: from localhost ([::1]:57290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEt-0001tV-1Q for importer@patchew.org; Wed, 17 Jul 2019 09:44:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55356) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00057V-W1 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDd-0004VO-MO for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:37995) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDd-0004Uk-G4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:41 -0400 Received: by mail-wm1-x32c.google.com with SMTP id s15so856249wmj.3 for ; Wed, 17 Jul 2019 06:43:41 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g19sm41640608wrb.52.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ED6B1FF92; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=ArEW43pxywcL9yjnRgBtIv5de7eQmLfLmd0j62mEqdnVjE2KBvY6e4i7r8caGaNICv gjnGCxmlKYRPj+PtHAFqRXFZIZsfLusiuwIgeGriKOzWViWwN7fnLteCLGKQes+aoko1 7+HzFRMX9/RILbZJbWOzKRdk3TJK5inKJSLCiwl+OiguT+yydEwQrb9Tu415MfQSHS+P KM2qyN1Tl8rYU9krBN+eDJYFDegZsTB7B54xU8Mxx7sfXwogTKv4i8rsDIo24Q5zX6fu PZxU6PqhjqdAETkH8dJh6s52OyHuJ4Xhie1NjS4tcBrB4aKc8/6tYkQqAyC1guLj7CHN 9tmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S6vlCzd8bs8oUu9Zqj4pZDk3kYEbnE2MFo03V6K4g9k=; b=KKrSwTtBTxmat7kJKF6cMlsWOj6iBEMxya0Dd6tXl2NWdWHoO34007P/vFbO2+IhpI QmUgJd9UM7w727lvkiPMNMaZxqSqEnMdRiXr/DIK/datyr8VojYst2kfgGFiekavugfd umCoPBGDz7QiK96vYHvi0RxTP1GSIlSnosEcGs5EdWNn/q7CrWpyywaggMgncvYWaV1+ Fn7e/Ns6b/j6F6o9pDEhXK9wPbHAQMReR2u0Z1lk1Ttxnw4pstaUNdMVJaIdnZ/kwC8Q yP/7btUi/DJAePOXKiyFW2RJmqIPa0nr3lbAFbyPF13Mq5miFSochD7nGvAwKpRVIUGm PoQA== X-Gm-Message-State: APjAAAUqilRE+u9f9gdBehtzwTfao2qFG1YK09HQ83iwTZEZNWjY475/ 1EPNstE0wn2rJEHq3CrxLwl1bQ8vCx4= X-Google-Smtp-Source: APXvYqyINJgXlQwEoZoov7Gz/MbfaKKgxKbKq7b/mI645kKZGgUcKIvrpK948fthDNHYQSs4+KI5lw== X-Received: by 2002:a1c:5602:: with SMTP id k2mr34525660wmb.173.1563371020251; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:17 +0100 Message-Id: <20190717134335.15351-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PATCH v2 05/23] tests/docker: Install Ubuntu images noninteractively X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=3D1 [...] 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 configura= tion questions will narrow this down by presenting a list of cities, represent= ing 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=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20190711124805.26476-1-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/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=3Dnoninteractive 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/dock= erfiles/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=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml sdl2 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371120; cv=none; d=zoho.com; s=zohoarc; b=CS3MdzYIZzn345lXQwgZjQJ5Mtf7l/+nC93Be8XZKgVfCuTa79l36hqE9b7Zm5dZhE2UpAT+3xgHB0WnZ5JmDQRU8RqZHHGDPBvjB7XPh5d4lhsTw/OTRiTTr8y360NC1JUTt0tj9g6DAwGkbWTIJyJGy6HYlKAUhh4M/E83Nsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371120; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=WWeqXrcXB84kGX6MkFxPQt9wsaOiKDkaQrQIdkcaT/iB+6PoLBUXbWJJ2rCq59WPyYK5KtQx/JhSfkNU3PC5DgskLS4NkNFUY2DiM2cABj9xyA0eO4mxSz8iDksiHv9Unuufs3z/mB10+hVgg4zntHbECuIbsQUNFU78AZIZETk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371120445768.6055036060195; Wed, 17 Jul 2019 06:45:20 -0700 (PDT) Received: from localhost ([::1]:57310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFA-00036g-IU for importer@patchew.org; Wed, 17 Jul 2019 09:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55345) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDf-00055R-H1 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDe-0004Vu-Bz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDe-0004VC-3v for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: by mail-wm1-x342.google.com with SMTP id p74so22209326wme.4 for ; Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u18sm20148321wmd.19.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:37 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 642E81FF93; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=MJwu6qJgJqg4/4reyh4JQu/jD/L9r9VoL8l96xNyFsbf5CKefgC+WRHRwbRGb/9S/l biwDlVy1AdUORKeVBTY/4jTyBXB0KHMtRXHbdjlDFtIGbximWiShdenkLh4EIYLwxcXx SyOAQ9Zp80W6NW40rYpH7dxvG/XY0h7vk6Hkweh3RAZWYj5ExEPX98WrO+Tru/SZsws/ K3Am7U+mbt9SYmvonyxyk1PxrdEZ2zVdmo2d+dOwzhJSmtOAcMr3XWWlnRnLpAUGxUDa lkUm4gC3N+sxfk39b9v1UGqWDmRY2XhMprWp7nYYk7Hamv7tuu1YmotPlKIhdod4jrI1 yoeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aCN/y1vsGbgbK8fKqVDDN8KS7NPTkiPqg0ffapBOPKw=; b=qmeMX7RDTFYx2QTm7kFCrxHZ+LE4sE+gR80BAHTfIPYshFvkZybgB2Wcs/vN7ZH0MW 4XKTXXHMUEtAUpFu0UOB+H1vCHR/FD6Tu4Q6ibIyl0OnW+hd0r6qLUljLrA2qrDIL9Sd eA8631VtQwn5foA41oc/v8ecSY8A0w9TxHhe3x9Q9blK9Zs0DnFijMTqC3p3G/UyLrdU +r1D9iqUptuVV2/W7hGPgerZY69tGJEwLqdJYPvHZOs+mzQT2+NdNz2AXST1Xsv1Cruo edb2j+LUmEEbBbCLtdVpzpI9rAyThaBfP2bMU6wqiEzs8k4Mxg4TnDiw4cFhfQegS/+5 QmeQ== X-Gm-Message-State: APjAAAVrhiuPs5QvoqPnHdngCxRe/HpeWorRwVEKoZE2cW3dGWALw3mM DU5rIu4zTv0SyNw/MyCuWNjuRA== X-Google-Smtp-Source: APXvYqwvQRNWe1WIOWIlr0gEFgCsiFjBg2cBORFw5uuKDTutaavKkrv4kmNsyxwsGX0Zcx3EsfWoCw== X-Received: by 2002:a7b:c1c1:: with SMTP id a1mr38759324wmj.31.1563371020915; Wed, 17 Jul 2019 06:43:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:18 +0100 Message-Id: <20190717134335.15351-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v2 06/23] tests/migration-test: don't spam the logs when we fail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Juan Quintela , "Dr . David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Thomas Huth Reviewed-by: Laurent Vivier --- v2 - bad - 10 --- tests/migration-test.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 =3D false; - bool bad =3D false; + int bad =3D 0; =20 qtest_memread(who, start_address, &first_byte, 1); last_byte =3D first_byte; @@ -327,15 +327,20 @@ static void check_guests_ram(QTestState *who) hit_edge =3D true; last_byte =3D b; } else { - fprintf(stderr, "Memory content inconsistency at %x" - " first_byte =3D %x last_byte =3D %x curre= nt =3D %x" - " hit_edge =3D %x\n", - address, first_byte, last_byte, b, hit_edg= e); - bad =3D true; + bad++; + if (bad <=3D 10) { + fprintf(stderr, "Memory content inconsistency at %x" + " first_byte =3D %x last_byte =3D %x current = =3D %x" + " hit_edge =3D %x\n", + address, first_byte, last_byte, b, hit_edge); + } } } } - g_assert_false(bad); + if (bad >=3D 10) { + fprintf(stderr, "and in another %d pages", bad - 10); + } + g_assert(bad =3D=3D 0); } =20 static void cleanup(const char *filename) --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371175; cv=none; d=zoho.com; s=zohoarc; b=mnUPsLGDKyznY71k9llDRh6sjR6T/10ZctJAkqPVbnpNm9fAUkBN670KER5xS1nnLt2nOyVWwDo//CPweJMH2qdFBV3YS93h742cKZVu1HBeiWbtIW3bz9iduxbRhm4JOlgr3iqCym57qHgQnNG4+J69dQmH9mFrGF0EkiztBR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=XkQWTX4W1CxzQiAgsS0BcUaL6Lcdn4nrKchnz33y20C9swyq83zunZWMjWezxvDvrrnQlvughf9eANPxYAnGMWV3M8qcejyEfO7UxomIwqXO4uFyHbpnd8CW3Igt/JNMrovY0ZSKc55ajn20ceYxPh1ie62OQUX5nTeWYwYll6c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371175630725.2428554018724; Wed, 17 Jul 2019 06:46:15 -0700 (PDT) Received: from localhost ([::1]:57344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkG6-0006vR-AD for importer@patchew.org; Wed, 17 Jul 2019 09:46:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55377) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDg-0005AP-O3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDe-0004Wo-VU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDe-0004Vj-P5 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x4so24867060wrt.6 for ; Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c3sm27339337wrx.19.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D6EE1FF96; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=giNs+fTJqu459Ra85k3rt+TwVJfpMwbneEuiXNGDpEjbfJV3MQDrS0+UJ7rPfSzoQi izJyE3+knowWEAZOcvIRl0yuzQvBjCskG3BeA8M9PnWNXCo7Xq0IvGfk+R0JuROw5EbP JnVELzoUJCMHZOBXM/6a6FNUjp0rUVqNUw+gB0tN1qdZPqWDrlEWze0dp6nrhxsXY0d1 LU9bs2PoaGVeiDA8yoNZe5MfzPTdrGhVG9E4lgOh9uW9Usts7uGnNuj/DMHdjT7xm0Y9 nD9U8txRTRvSen4kej8/u4mvPNuqw6kPnmqiX4qyadV4R0LuzD9v5W6B4/VagV+Iz0g3 4Irg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=Av7MPvhZnwMozIA1x00OFONbnsc+PRllxRiXPEaicDqQ1tjRcpS+gdarASmN+6gHC8 oa9wPxRzrzrKdCeVraYqOogKZQCWOUlfgyVSdorQVRKTWy6HZp2v5EsZEzygQheDEzha /NN0JNFArO111nJvxZ9dHWSakG3Ksbbvg5jazFEs+Xv2l817x350Q75pngxK1mlHjdxg ZVNEhQ5kT6PkpBOdS2ALnZuUkNCotdn36DAFifTxfaVXmZsVrim8Io1rrYNTe6xl90fT fyYXTVz19PwLwWquvrrtZpR1uHijqhn2+zK3+8wHsOYgMTtgOiMaVXNOmjT25PvxYsIl zvpQ== X-Gm-Message-State: APjAAAV2HH5jGZAB1d73gJ0rNJ41/MczG3QRE0XvNX9+FTPEOsMrD0lp J+OZ9rKlku42zsp3mFedXoG9Ww== X-Google-Smtp-Source: APXvYqzeZsbzVxYxFSTKa+P5/jqphCzlvBvVh8/7PxznOXdMdHJQwIRKAtPrnQdML0B3M23d06rudA== X-Received: by 2002:adf:f042:: with SMTP id t2mr42957217wro.139.1563371021579; Wed, 17 Jul 2019 06:43:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:19 +0100 Message-Id: <20190717134335.15351-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PATCH v2 07/23] tests/dockerfiles: update the win cross builds to stretch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 6 +++--- tests/docker/dockerfiles/debian-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-win64-cross.docker | 4 ++-- .../{debian8-mxe.docker =3D> debian9-mxe.docker} | 11 +++++++---- 4 files changed, 14 insertions(+), 11 deletions(-) rename tests/docker/dockerfiles/{debian8-mxe.docker =3D> debian9-mxe.docke= r} (56%) 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 =20 # 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 =20 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/doc= ker/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 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/doc= ker/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 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/doc= kerfiles/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 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 +RUN DEBIAN_FRONTEND=3Dnoninteractive 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 D43A795B73B16= ABE9643FE1AFD8FFF16DB45C6AB && \ - echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" > /etc/apt/s= ources.list.d/mxeapt.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A= 276 && \ + echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources= .list.d/mxeapt.list RUN apt-get update RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371147; cv=none; d=zoho.com; s=zohoarc; b=OtjYHZV/GjKcar/4swuIgIW9uxBo+ntSbusC4ieVx7mUrxXFALyHJSbTAWb0AWjMpPaqTPEOe5nAgrcd6BoJanl/4daca2MSd0tL1AunulR3NeyJ0/v3HthmxlIwHoNVo+QzIOkRK3rAwamqH1czcs4xBel88POJBW3rgcxMZWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371147; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=eI3f/7HZn3nmWlxNnEcETZ4gooMx8GzOGSG9YiqZMBjVA34Nw+KIstNXCS5OMdO1zrwFqqFSinmSKi7oPl8NkqClcK8C71z0FUK6ZavKwv8Wkp1dNcne1tVBzKcfM02AKRBeEXpOeJ2jISnREYeOrpUy1BTuWydkIhc1LbaR+vU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156337114781840.23348060713727; Wed, 17 Jul 2019 06:45:47 -0700 (PDT) Received: from localhost ([::1]:57326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFe-0004up-MD for importer@patchew.org; Wed, 17 Jul 2019 09:45:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55376) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDg-0005AI-Kt for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDf-0004Xc-I7 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDf-0004Wa-Ay for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:43 -0400 Received: by mail-wr1-x442.google.com with SMTP id p17so24863425wrf.11 for ; Wed, 17 Jul 2019 06:43:43 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k124sm37486274wmk.47.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 91C871FF98; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=DNjKcM3ehWpslSkLygsS5OXu26seAV70RnFldajuN/vwqcBgFh8e6IB5BCCylmQRLg 0FJG8DGz3sWUPClchgj+mud/ksF3GnqY9804CjQR7iNQyl7x3iB5/4etyUJRmV6Rhvhc AwEr0N+mLeVLV9PEzuqMYWRGzUIhzUeZIkX/5TRvpgd4jmaL5WHn5IkkcoysjcVOongT 5gJ09lGbtt1URiBkBEXVsb0GxdRuJYv++M5xYD+vJNOmwsnz3zIrSrcE2LtdchzrvJRL caah9WhL2JII2t50/vZx4BUadWU9x7wA8EbNsOc0oZUr+pmOWAb5PAyxWin6/3H0FlB2 1zqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=InzAQhPgsiZeCvOOwtFrju7Mpg22dwWv/LSowypdtzY=; b=QRqFyY25xaWjWw87V+ACUycqmyPuWJdnQFsmNTgkBRGoaxxa7Ts4XFYWXp1pfmPImA 7cDFp0w9WAYzr7lxmRKa8pTD5wpX+UJTD2Ca1/h0iRjT8GmJnxsM5dczHVRExqQ6unQ8 XZ09yVilLB+lh5OY6IP+0HF+3OF1eLO5A7UltpH90agB03t29CJVv+69+THR6nhZYKDp 226nnk1SuCer4Poh1e5/bWtUHQZ1AJgwlbMwvVSpHjOqlQCnCmdpfIyFzDiKYi9LmR74 LPYhlP0Yidf9oe3S80g4wwEgdZB6gezuTj2YZ9YF1QyP2p6Xb0Uj2mXZLiejqwPGbfeq 7cLQ== X-Gm-Message-State: APjAAAVanq4mDoU0oD1pR0TgWs4Jr70Ffj7V40XB7zAPKE/C/ekOEmdc XbKFsqMkKSTEFiH2jxndlN4y2Q== X-Google-Smtp-Source: APXvYqy5LPBdMcAgj56MRSOxH5MiBCt40udYnlio08uIiMaFamLUoaNxbFG2JJsth66+WJrcWlmfBQ== X-Received: by 2002:a5d:66c5:: with SMTP id k5mr44802271wrw.304.1563371022261; Wed, 17 Jul 2019 06:43:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:20 +0100 Message-Id: <20190717134335.15351-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 08/23] shippable: re-enable the windows cross builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The pkg.mxe.cc repo has been restored. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- .shippable.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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=3Ddebian-amd64 TARGET_LIST=3Dx86_64-softmmu,x86_64-linux-user - # currently disabled as the mxe.cc repos are down - # - IMAGE=3Ddebian-win32-cross - # TARGET_LIST=3Darm-softmmu,i386-softmmu,lm32-softmmu - # - IMAGE=3Ddebian-win64-cross - # TARGET_LIST=3Daarch64-softmmu,sparc64-softmmu,x86_64-softmmu + - IMAGE=3Ddebian-win32-cross + TARGET_LIST=3Darm-softmmu,i386-softmmu,lm32-softmmu + - IMAGE=3Ddebian-win64-cross + TARGET_LIST=3Daarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=3Ddebian-armel-cross TARGET_LIST=3Darm-softmmu,arm-linux-user,armeb-linux-user - IMAGE=3Ddebian-armhf-cross --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371158; cv=none; d=zoho.com; s=zohoarc; b=S2Ratrq8k76DVFHKJlCsvXVHyKzvrGvBW2jja7CQqqCv3AZdQfYYwaSCmo2qi2U7jww89tZAazWTnOxFJk3qH3sQ2EfLeLhU9Ven6/K7ufcEJjlfwmm4FIPwbGkxyp+Jh/n1qH58Q2Y9566xw/bz5pPefgVsIAZ1r/r2DL9OBBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=Ft41ocOSHX7C2P+7kepCaNSMu3ViaV+eJJdfwopSDeldiGKYgA5jo9TYKTbBvEgzlDHPTcMK7P/SpHjtZ9ZvaVIckDl14UtRWyeXNpXqScANF7JCqh+LU9/PzFIOAz6VWDI/xYRNrPHnL/bgjitnpNVlJhY0Sblwh4WVKyl8H4s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371158843189.44414892618045; Wed, 17 Jul 2019 06:45:58 -0700 (PDT) Received: from localhost ([::1]:57330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFp-0005k1-C1 for importer@patchew.org; Wed, 17 Jul 2019 09:45:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55422) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDj-0005OV-Sg for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDh-0004Z2-OJ for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:33672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDh-0004YR-IG for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:45 -0400 Received: by mail-wr1-x431.google.com with SMTP id n9so24957161wru.0 for ; Wed, 17 Jul 2019 06:43:45 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b203sm26458811wmd.41.2019.07.17.06.43.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A883B1FF99; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=Bs7r1z3Rc5UITsZbxQTS+0iQdeX09WyNAxV1fwWaJZPr12FWzb/2zJdiSlyiHXGE1F T9QZZFgU0qG6XTBbGVCpaccNItt4tFS7VFmZQxV0qPfSL5bP6exiP40B/Z4aE6laU5Jc zyKqqheFWmJlAmLIbRGYkabo5dD6FYhBzOeYxD+cGFQ34MG+YX1hMkphL9N1SGVY2gMj XyOWnQT9yriRfkSK/ydC+1HNjrx+in2eDgHtQ2tRKD6Wha6mr+TqqsNXXiHfDNMMhU62 DRMlqPzyQDkd3GJTPkOJ+btJqKyHZeuoN3YfFBpkEu15PN0Z3vaFTPOjcYxE1wP5c1k1 QcbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+JHZS9szw7jPxS39YpdN8h8GH5sYnizhpgZEOtZ5EzE=; b=hQysB4o2E2KfnSdR2gNC1tPK3zvGyU49xfYwKvpoHdIw9G5Ls3D0kJXrI1jKvtt9fz RllixDMw/B9r8Qd2UrMxBYestk8ILNapPKJqz8L/mLvyaHW2t2OTGDrZ/khFRPKhY/am dPpqMLM5uXdVp2VJyWxULMk7R5JS2gL4aANvaqgPrFTuDD2ADiYllSUX/XJNfnroXfxB DCA7SiAo8IOrseTtfjc7CXu2X01jhrW1hMaXueeH3wQw/QOaraL4jtOylZSWI8uiOlgK +odDHAcxqv/892kY8mDeGsM5Bx3u807VSYuiMiQArwJXNPkib7y4EPCI0lBU1tEKypDF xMNw== X-Gm-Message-State: APjAAAWxOi+vGsuFvt9yizrBZIwyPHHHmWyhy3fIYd4ojalnqnO9/Hyc jCMJ5/3p/IlASFWX8vUWFr868g== X-Google-Smtp-Source: APXvYqw23Tu6CfqGDPX/KNQjX4ITsuKqB43k4CuIgwEgqCysF8RY+wi+qJf02Osx76Ymd2YWtkEFBw== X-Received: by 2002:a5d:4ec1:: with SMTP id s1mr40674373wrv.19.1563371024356; Wed, 17 Jul 2019 06:43:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:21 +0100 Message-Id: <20190717134335.15351-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PATCH v2 09/23] tests/docker: Install Sphinx in the Debian images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Message-Id: <20190715174817.18981-3-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/debian9.docker | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/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=3Dnoninteractive 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/dockerf= iles/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=3Dnoninteractive eatmydata \ pkg-config \ psmisc \ python \ + python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371132; cv=none; d=zoho.com; s=zohoarc; b=leL3Z4Ka/7mkz6AaQvZ967v/qeCNVeLT7fW3QEPircMpO2DFYvaQ6b3sqa6v8+/Ty6CDhu8Yn4ISoHxKlIrX20SUbDsBugo13SQP+PzPSUWyD54rL9WKnhts2sbZ83LKkb3eHhLXZApXngKg0kxgy9fX4KGTZgopmtnGO6fYZCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371132; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=P28GV84oly8nRMrjAesh6m2xp/gEBo7DomNIG8t8+RHyn9bCwi/EdiBhk6rXFxQd0BruNBanfBZxnQhkoYAc+wscRui+vyHJwwziO9K9RebOOdCwYLakDaYoNK/nxM3w8+BPXkGFUY0fZUrvDkxLXlNotGZuflnaP+Nx10CAxwg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371132085724.4881148984739; Wed, 17 Jul 2019 06:45:32 -0700 (PDT) Received: from localhost ([::1]:57312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFL-0003q0-0b for importer@patchew.org; Wed, 17 Jul 2019 09:45:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55414) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDj-0005M8-HO for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDi-0004ZG-3U for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDh-0004Yr-TC for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: by mail-wm1-x336.google.com with SMTP id l2so22244366wmg.0 for ; Wed, 17 Jul 2019 06:43:45 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7sm23480488wmd.0.2019.07.17.06.43.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF2B31FF9A; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=NkgeUcLd9uUdCX/FyNkApLdMESHm9tNZOxvrWMTdgEISNWBBNkShUayPe5gIRcnGOK hfb61tzDVlPzmL1vZc7D4vi90fksC+1Pbl4vQTVaKdfL9IViE7uqitVj/vhut9vTn8SN PiRaCK3UBvooNDLdAWZzB+IjAa1L2YU8vXmLexKwrnj+7wH/lRpcmIzODgj98nY/GBDO +w5LCsaRMZVm6s7qnLXx2tXKN6KR+7K3GfSwKC4y6OvYk7vI52RWRVQ4oWUScevIaaY0 2cYMqTm5kexrdfMkPOeG79TZ61XgRXKPdSyqzR1Bc652++/PDkRT7rUwPdOehK4PqG9j 7qfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=RCA+jm/sfQyRycj1+e1Brz5EihB5UqPLvDDu9CR43y1MGQ168nU21dJNIBMofXgWTS e+NBGQofWJGu0PrlmrPa3nZNIK6WfWZ10ONn4RtGG7AQRVhJW6/1ZZC0g8OghFlNMA+R Mp4lCOS7Kd0bgOiqzEBLX65uMaD+Lg7C2MyeYtyXG/5kgre/Q3Sm3F0f6nbkbkEZ1uBi lwgqKG6o77FjWxqrvMxOMsJwXhXhMtzz9GnuDcb04jiqs9xDZmJNfbfURnYoMo1zT9Zs +++r5/htrl0Lt+k+q4Lw9E/iCli34E7pgOUtHSPzTvGfDh9TZZZYjjUNIsAfgWrWHCij vX2g== X-Gm-Message-State: APjAAAW0pnA/Witr+so+ehRAEjVwcuZWav37eJeeo8zmcsxkzxioaaH6 wmYOnTYiOEdx2QQytueYq3U6Gg== X-Google-Smtp-Source: APXvYqy0QePNfFzRsN8E7WOpsIjIurvSx40reTgjHa7CgQR3EYVVWEQ/P2Tqzzlkzdo6r4Om6OdW4w== X-Received: by 2002:a7b:c0c6:: with SMTP id s6mr39064273wmh.115.1563371024740; Wed, 17 Jul 2019 06:43:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:22 +0100 Message-Id: <20190717134335.15351-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes: $ make installer (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=3D${i%.exe}; \ arch=3D${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=3D"y" \ \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/home/phil/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"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=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190715174817.18981-4-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ tests/docker/dockerfiles/fedora.docker | 1 + 3 files changed, 7 insertions(+) diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/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=C3=A9 =20 ENV TARGET i686 =20 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive 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/doc= ker/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=C3=A9 =20 ENV TARGET x86-64 =20 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive 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/dockerfi= les/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 \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371066; cv=none; d=zoho.com; s=zohoarc; b=DDjih8iTV19a36IC1YikCpHKhQQf+h19NLd6XF3lv/a+wbjVaDFO1FTLtWwJQmCmHSs7r2mSRZBkD/ie95hCO4MNBhNKquYT92d76BGjPQCtgjMEMU30BfoyQN9eeiV4qpdlM3NIDs3y9yt3X198cZ3p/3gDGOmoLVPqc5pgSqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371066; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=Jdpvx/uHqLIlNUMAVLsZC/8TQp4uj9eboy3gmKoN2hWmVSYQ4hjYiie04xR0Mc/Pw0lbEr7t6G14eU4hDxdBkg/8GTdOpdQ1oJE92gIgLDDiFu6bJlm0BWmfPNBdapve6RT43zniD6C3D54ZIzU//GyjxQkQSkyHkb+1pOnXF84= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371066691322.33601862918033; Wed, 17 Jul 2019 06:44:26 -0700 (PDT) Received: from localhost ([::1]:57268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkEK-0007Pn-Pp for importer@patchew.org; Wed, 17 Jul 2019 09:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55439) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDk-0005RQ-FU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDj-0004Zx-7N for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDj-0004ZR-0s for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: by mail-wr1-x432.google.com with SMTP id p17so24863663wrf.11 for ; Wed, 17 Jul 2019 06:43:46 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e5sm25397187wro.41.2019.07.17.06.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D42C41FF9B; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=sZgYiQbUfXR5qX9VSd8I1yoHryR7pgYk+5TpCtwbeDutLRkXyGicmElSCx4k2ClZPQ +cqAmfh7hkowjGIhM5yvujBDpUj+qeRKLAWDTNa/AhZXUMN2UCIxcdYmbwMazH8iFj3z 4AmJQdsaX4SAEL4qimcQ/TX5eeytHN5LLW7QYsvSO1bLv7yr0LJj7KVuEpnlF5Xj+Dad ioI3MehAMxi/+lxq9llCss8Urf2NU2wbARhzoE+IjhT1HdrxqbjUJjeDhs2ewvhc1d+y s7N6eTXjou5YjpZz93qKpPpApFkPAnqpOLa8FtZjPCsttvttEpE21b2/EMbTEJDSne2H dGvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RNRpRS7GbIkrH2qr5hQXrUti2KQ5HOwEYc9CN8AzWzo=; b=dHADBUVRuUMQCQnY4EjuiSJysgMwPIjPwJJRma1QQukNY5P/tRMTxhnEUbrXsAS4UJ z7tPepAVUIgRi8VqFJ2AF3G8yLhPR+vC1M19Yu65roZ/JtDeZ0lKOFb8VnWx48lm3Mm8 1J5ytbKh2iYJGZHnLsSGqd6VJq6kuhbadXAUZPcJf7QnybLshHYcmUOum75nm/VZRFVM mYgHUrSFJelPpvFADlcT6XIC4UIHUPbi8IpMsaMeM27bdFkY4Sou3h5soCvLMJrJiHBM oH8KVcxxIDadNVKeWpNXMlZZfCGCdTZkKgA2S3WRRFhCr7EiTQ4ooQMPmVDt7NMB1WS5 TBuw== X-Gm-Message-State: APjAAAUYoUsq8mwYqiltyuzMvz/ec/lqDYgybCoioyZdgPbPhHMrj2GV Ys4JGPiibsNaGP0U5l70JzE6cg== X-Google-Smtp-Source: APXvYqz/zNc/kdj/rVjMcZZiV7a+XXX0pgbMoCFttHaKQXSTCLvvskLw3YDwzDJOu03LKgTyzCuQpA== X-Received: by 2002:adf:f3d1:: with SMTP id g17mr13868384wrp.38.1563371025858; Wed, 17 Jul 2019 06:43:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:23 +0100 Message-Id: <20190717134335.15351-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Message-Id: <20190715174817.18981-5-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/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 =20 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin =20 +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig + RUN DEBIAN_FRONTEND=3Dnoninteractive 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/doc= ker/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 =20 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin =20 +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371199; cv=none; d=zoho.com; s=zohoarc; b=Z/v/1J1x2hScuNg87hZhTb89ySRU08iAzR99vhPboKW7zD0OSi5p0NtJ8PJEJYPLIChRxi4mGKrJ2AdQa7hVtgUN0FTua1lVW0kfxbzD25YGYT6vt7woIsg5rDEvEJFGM1Za0UUIU8hkDL4Kz4KhyHFlDKHBxSt8QTAiGhC5noo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=PIqdhAKgr5/3vrJCtXGL+I8UFvmcZOe6KF5wsaDlibbw8sv2tERyE+Mv08sNsAbhBnDIDrF5My7s/DjNWXqypPzV+SYvOvYD0Tofe+NDaFF2rcSnyvJhy9vlvBEpTjvtcnOii5lhU6a+futsn7xOkakVvXrQVE8sxBLQkpSa5gQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371199003700.1123406270913; Wed, 17 Jul 2019 06:46:39 -0700 (PDT) Received: from localhost ([::1]:57360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkGU-0000F9-0D for importer@patchew.org; Wed, 17 Jul 2019 09:46:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55448) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDk-0005Tt-QQ for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDj-0004aP-Pw for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDj-0004Zi-J4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: by mail-wr1-x435.google.com with SMTP id r1so24881109wrl.7 for ; Wed, 17 Jul 2019 06:43:47 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w23sm25040444wmi.45.2019.07.17.06.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EA8DD1FF8C; Wed, 17 Jul 2019 14:43:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=W8P5MihMKVg7EwSAUqoqo4yRco5P21vQwOT29xToAQv/4unnbgTj3BSliTb6v6fQ27 9JsgQVwafEL62RJ+mpK9S3XKLC80Ifc81z6Erm7IPx2OBP9s/L+f607V8KjZVtlq9qAU CJws0goqduW0XYBh3dOgU7XfOfaUEWatrkjg4NPbLTk5dPFWV6d1NuyZ2y9MtdAeHCLn f7bSHphPEULZ10agW9eTNLt1eWhuWCp5Ck6OvCSInFhr+45hGAIYnCteVBvfO0XqI2oR GP6OEBVEqnLG0JPRKjYNeOiy/sqTkWPhCmB3BbamAu/nIUKUevJNFPzPG7tmaVTzPuLj rVZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0S+4gBrjFxD4IDsxwuRAQetESfbW572jH6fFh6WvUkk=; b=RN6i348ceTVLJ0f/XDtV8hPBNYqTzyvwEoORx5qysw+bQ6WMwk46u/yt11FkR42Yf+ a8CJIPP8lXykWkC2Ms0su5mscN97qIdWaO4//XXe7ayQhh55sC32jZVDMzTskH0aAmGt sCrQxS08jw9oAjAq4cSySiMO7n40HLNmrdcl/YlWhbuUPqOvEaBxVcqoofGWNgeZRnFZ PYsrTHKLh+HFZMrxJCWmTr1wfiUi3nRi7ji4du5fZHJUVz/ejqOaFkt/7RXSJMUB7xVG LVOjGrtERPlYHgQM80E5jbMQGUg0MgzSbyD2jpGHfmNpDPTkgbJh1w4u7cVOJnM4/3Vm g9Ew== X-Gm-Message-State: APjAAAV6BttGFCfy6zeZNuBthgDBErkcYw20KoKrrR4ZeHX7BU1Sxjx5 ZmRGwIWaYVP6B2wne/6i9veE2w== X-Google-Smtp-Source: APXvYqzY2OneKDWIsgPvVryRFgNybBYSnTf9pHUWJNpN8TaGuuamm9rh0RLOmrm7/w65Jp1mQ6PuXg== X-Received: by 2002:adf:f601:: with SMTP id t1mr43430852wrp.337.1563371026340; Wed, 17 Jul 2019 06:43:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:24 +0100 Message-Id: <20190717134335.15351-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PATCH v2 12/23] tests/docker: Install texinfo in the Fedora image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Message-Id: <20190715174817.18981-6-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/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 \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371535; cv=none; d=zoho.com; s=zohoarc; b=jPLILjao15z616obQrUO0wPROdJExt1gxgpvQQ5fDQLXcSMWd3N1TlwkFMU0umrftrifFBqf3B9F8Ecgtt9YY6haFXKskbgpTju5rzpOR2Zzg6w8C3TjagkKYThj7evGxdiITGymxz3pq/ISU1RUpFGhZY6mNOV+HRnx+o7lJaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371535; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=lbYeXu19ID74NlPMuS98NUexTSjzh1tLh9mT/VZLSdxgEO/1J48+D3NdJOc5nCM2DLZEUP6MzLK9eUuIely2fCpK05K/1rl42ZVpuOKUeSojOzT+SV8b9KOKF4WyC/xAitVUAoIRIu6Mq4XRwhhbrt6IpyVicXomk53D9NK1waU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371535353904.4550746109475; Wed, 17 Jul 2019 06:52:15 -0700 (PDT) Received: from localhost ([::1]:57428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLt-00012X-UB for importer@patchew.org; Wed, 17 Jul 2019 09:52:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57854) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKh-0004dS-Lo for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKg-00014X-OP for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKg-00013V-I6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id v15so22272962wml.0 for ; Wed, 17 Jul 2019 06:50:58 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10sm18975823wrt.49.2019.07.17.06.50.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0AB451FF9C; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=LloJJfsA9sHBBM7peW5bhux7Tst3iGkBDy1wseASmAmsjI8YrQlcbYR6V1GgA2wPZZ sDvqVIcpdf6KdnZxFESbGTcQe3H15CAZxEhy5trw5RvWYc1CP0Ks8k+Kk69RyHDtd4Xy /FE1GBJmyJP63yHL5ylzgJ+DeRZDUA2ZKwKR/S275pZJnGChziss+WqGCASSiZ1GjmbA ANaH1934Ya5+hmjZ28R5hRmyuVJfhYhFIiOtVnCPepDqkZEfX5wLfy6jB8RjL4T+DR3L VQfFFOXBqj7WHExo7hQwQ3Hx9FOZ2EbGVvp7z8i1035rMaYnTl9EB5IPQ85OpOhbT5K0 EkAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=WVfJc33blBQInc+WIoBvnyD1spVNJGQgFuS8di7J6/ZPi0ffBVdHwh7ZJkr60els2c nhEMCiiBX1K8xZQh/mWaxwKcLzzcovJuqj0le2TaO80mzvsmCcwWm5XW2EHRcvh9bgbE m1DTaZWOgqNnzwTyIn13QHRgPxe+l02H9nZToq40Rg+0QSqxDG9FymxPgyxJEXRUoHvP 4rciDJEgfbC8lIuYooYEYpqMal/5Al1PDp6uJYaMOB4+iBw7gCxCvmNjqHZjBsK/SGyP O9XKc5Y1B7h+sUvYlfre3G3C28pPrGc71ydC3SmCbxE+gYHImN3P/D7WHPtnWsTGeVt5 SXEw== X-Gm-Message-State: APjAAAWfHnDBTAVqprB+Xmeayx2rXQqCNc1UtOJuRf6N7dLaQTNBBkxT EpPC/uFtoBcLxgrOr03A6XfnSA== X-Google-Smtp-Source: APXvYqwjJCTjYFCIBCznEYogriHzgdSkS6stpcKviC1YxVoRr3VWStNnZlB5TVqHfYXqtwODlgW1sw== X-Received: by 2002:a1c:e0c4:: with SMTP id x187mr35258811wmg.177.1563371457347; Wed, 17 Jul 2019 06:50:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:25 +0100 Message-Id: <20190717134335.15351-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PATCH v2 13/23] buildsys: The NSIS Windows build requires the documentation installed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes: $ make installer [...] (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=3D${i%.exe}; \ arch=3D${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=3D"y" \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"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=3Doutfile 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=C3=A9 Message-Id: <20190715174817.18981-7-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f9791dcb827..5a462629370 100644 --- a/Makefile +++ b/Makefile @@ -1075,7 +1075,7 @@ installer: $(INSTALLER) =20 INSTDIR=3D/tmp/qemu-nsis =20 -$(INSTALLER): $(SRC_PATH)/qemu.nsi +$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=3D${INSTDIR} ifdef SIGNCODE (cd ${INSTDIR}; \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371519; cv=none; d=zoho.com; s=zohoarc; b=TQliPmejHtIqAnE64cBaiL3ukp3foSI97g+/lckMFrKVNKoJt4Z0qwFbhIGpFgf5r16ZCorrVcfRUBb0DP8uIVIV7MhkW+mFUz2zeR3pZ/+QSLnCABV92I8tuCueHxGHxRosmA5US7wfXlAKn0i7m8EE0hbLJ/hHmt5/RFdDP4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=JSeOVa5VbMGVeXGZdSZa+5WbA+nSxTW8drWOBvVZs0wouerXsmN00c2m3FxnzF+9otLkhF17icYsEXe+yOA4xdbcSVY+mtz0SY3SbgTODMriR3V3FahOCrGODtnQGGY3FunCpoui6sdLq5A9Tnrhc6nt/FIpsHZ6f7fC+eZUiz4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371519106894.7815439197277; Wed, 17 Jul 2019 06:51:59 -0700 (PDT) Received: from localhost ([::1]:57423 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLd-0008HX-Q6 for importer@patchew.org; Wed, 17 Jul 2019 09:51:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57809) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKf-0004XG-J3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKe-00011s-E0 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:53856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKe-00011F-7K for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: by mail-wm1-x336.google.com with SMTP id x15so22257009wmj.3 for ; Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s2sm20145925wmj.33.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F6BA1FF9D; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=AtB0JyaCda6TltsaRVl4uiyveUz/np9FIz9Kkze+bxXbieJz09WCSrmb3sc7pcNpTc 0rm8YGivuX6mfhNTRmy6HVy2tGWAGj6YwWpVYY2ECunl2g1q8Xv2V1xzCTpBgbmLXZK8 HXOqk/e5PCKVp4y1yG7pRI5nsnbpkzoQVyah61X4k3Bcr45LiZwmoJKSanYzhbY/IY7r +o2qYQxw71pfftvEt8mulujnsdA1bhjML4kxSn6Jkt+IOPtKL6PwwpPahYfHEMOK+Lew wITRiG9iBk2J84yakUIbziwbmXNiy6SNR6TJorlr86pXT1nFp3VzdhqikID7wknh57hV smiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=fmnAC4A6l6leBqbvczi+iF+VCmm4F6hjLL2QLblbDIMZiCU2dKo0hQdjJwb8OuzqvW Du+vRYRflyVO1y9yCz1A9rYB6DoU6mC5PQSoSaxTkEkBsEtGEXG/jPlH1Nh9cLtNgDH+ /syIwV1ruTZ3y/KiqEzhJXBLwld/JPSDPGnB4V3xJX8p7s7k/S6KvjiMAIa6g6INRjad DF5/XFgZfQzH0tGElNIP4fKzUFxQLF5lZb2w0XOXqMoAqrur56U55+njvtQOyQGW2D83 zcYnAEfMeUdg7FgPzDpmLQ2IPIh52zwOnmANO6IxjmtotcOa2305QHtsid+a4I7ka5qU E/lQ== X-Gm-Message-State: APjAAAU75QMHbkW5i2681+ktlpG54+V5rQ9Db8Rjbx0d0jtGEMbXxJ8F jGJ4X2hZ6O4pjbeaPC7hBJqYZQ== X-Google-Smtp-Source: APXvYqzAFh6mpeaqda2W1x6xaMyniAllARZY7HwIWLgD2WEEq3mvClcd+RbDaX+AFkhN/8P/sAi+7A== X-Received: by 2002:a1c:cb0a:: with SMTP id b10mr36500299wmg.41.1563371455051; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:26 +0100 Message-Id: <20190717134335.15351-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=3D${i%.exe}; \ arch=3D${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=3D"y" \ \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/home/phil/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"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=3Doutfile 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=C3=A9 Message-Id: <20190715174817.18981-8-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5a462629370..f3866ee084c 100644 --- a/Makefile +++ b/Makefile @@ -762,6 +762,7 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ efi-e1000e.rom efi-vmxnet3.rom \ +qemu-nsis.bmp \ bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \ s390-ccw.img s390-netboot.img \ --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371495; cv=none; d=zoho.com; s=zohoarc; b=YL5NH5b78QQ2WAObjS98cTgRR+b4cDq9nSlk7q7X2bLYhQNSdVOCOYDK8pc4HAaMsDjuoT2YzZ/W6ptZBCeA2sOJgHkI44UyJjz/YAG6efOcTm0cVmuEjLBVYfuD0mQOeSMUVfx0VvEeveIkA8y29H+WpO526qs6DjkZ4KCOVpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371495; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=dJ0VC9RPtSHXsCvhkFb43itGfV1TEKBSWr/T2C+Iqim1a/t4kQY4sueSi0AlZWZQ1yZrW8O/FVW1Ez3PIa0OyxzgSZzIhcZYVLfexvCqQagnX3mg4Zf5k044tnWN7xPwjtdfwsOAkPt9zXZQSVokQpRO/j+QWds6p/WB/4nFa5o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371495351420.2653251029607; Wed, 17 Jul 2019 06:51:35 -0700 (PDT) Received: from localhost ([::1]:57406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLC-00069m-2t for importer@patchew.org; Wed, 17 Jul 2019 09:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57772) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X3-2k for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00010u-5C for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53853) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKc-00010G-Ue for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wm1-x333.google.com with SMTP id x15so22256943wmj.3 for ; Wed, 17 Jul 2019 06:50:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b8sm22780023wrr.43.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 334221FF9E; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=c4yK9Snq+bARoHabV1ZUkXfsZExH/BB9+KV3esOy6BwiDBFbF0JTXRVkBtbKv+VlgJ MaGf2cDsxfaqzl+ibGevXCb4kW7pQ5oEY0dQM3x0/oBOpyipMG5axPSIEIjST4yYCV7l hshM4Y8nUzUZVeFNIeYgXT44w6PAwwbdbhecR60lC0nyVc0g68eiaoSqtL2VoggKKwpJ xZ1rjAwPHj5xCI/uyPbMeGosMRkA6nlFZQ0to0yVUAucujJV8fe3AVvTwtWlh9IIJAQQ tMqGLuHu8soekVDnKdnl/vgk2xp34aV2yrVHsZjCxPcJ3+VxAcGqyoXF03ooPthaLAV4 r78Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aiXkUQ2gKdXWnndGoTZSa73d2EC/iSCFpvxehWxd/BI=; b=rDKbgz+hFfMd/I681dmXL0elzU8hVD/VRpfOilJpGHKkL4URIf0jbU4aB/xb5zRBXS RH7nol8rvSdp9HDzvBkEUNV/zFLTO/b+SFn5BXOYUjurbrdz4SF+4Bzh9fLU+qTq9pNK huwfKUw/spq2wGYuoD8GZtPK/A1MIdLRLqu2jO+a3GS1NXuDQzfFP674BnE6vkMLmANe lcWy+Hn0u//WVXc2OZC3wktLJQYzhG47aB1snrdO8JFFcr6nOCbQ0e7OLRMhwqJpWrpI c/D7WfZXKtGrRxk6LaNcRMksBjVwqXs+U8VLr2DEl5YeKCqbzWXYkRQ376E5OJ3U8y+7 OYZw== X-Gm-Message-State: APjAAAVNKPYX5gnhTV2AEuzHP79TdNAp6Hpz0ZOxFhBj/5MymyUpG6o4 gUs3s0/tYOVT6la9vOuMUzX1Eg== X-Google-Smtp-Source: APXvYqxWpowQNhwAH3cUBqXh+oZAript3ST5WgtN5GKcaAFFRzl0cGgB5Lh0FGyVsUhu9WOXyUieKw== X-Received: by 2002:a1c:a8c9:: with SMTP id r192mr37999068wme.43.1563371453809; Wed, 17 Jul 2019 06:50:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:27 +0100 Message-Id: <20190717134335.15351-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PATCH v2 15/23] tests/docker: Let the test-mingw test generate a NSIS installer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The NSIS installer generates an executable suitable to install QEMU on Windows. Suggested-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190715174817.18981-9-philmd@redhat.com> [AJB: also --enable-docs in configure step] Signed-off-by: Alex Benn=C3=A9e --- tests/docker/test-mingw | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 =20 done --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371559; cv=none; d=zoho.com; s=zohoarc; b=oAk714LVSgr7uq58xCSzzniy8atrERGYssx5mXtGPnEf7qRjzzDnoR3iC523+/1poktOaWkcah0lrSGgt2REZMNwIuwFOFUMCMTbyPbmZ0v0ng2d1hMqbzbfB4bApAvbRjS+1I7XC/PJ+wTEBJoSYPARIUYgwBuMH5lpPgsSvgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371559; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=Ix/J/KTl1BlKtFYvvI1EePPyP/CflX6EpZ4h2nvqEz7v3o/hZ8o+Vp6f8E83ODZ1EYMBu9EIQPadZVh8kZB94h5PX8sHSCipKNFQynUZh+711HzxmqPiz8YbbDdzbBmdetAknFP8pvDlMFWItVQ2xAtHI9kSdZJNWjR0+SEIn8k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371559061689.95937524534; Wed, 17 Jul 2019 06:52:39 -0700 (PDT) Received: from localhost ([::1]:57448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMH-00032g-Lx for importer@patchew.org; Wed, 17 Jul 2019 09:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57885) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKl-0004pe-Cz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKi-00017I-Tv for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKi-00016B-NI for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id y4so24936979wrm.2 for ; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k17sm24887585wrq.83.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4743F1FF9F; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=oDTxKr4SsJ9/6hNlT8ERZ/E2JFsl7FVBA1crfvK8fkdYMFpjIJRRLJ8EUsh5Ul8+Yi 8L+WB3/ISCZPoqR4I2eTY+QFNOWBN7oY+cCKKGmwhV+z7+sKlL1CLZA1lVqeF45muA+t 2H2+Cxl7R8//L5znZYE850ixNJ8ACPJUoYls3RwN5++AXXZBIWZ424l0XQzoAVRfZi0R YyXQ2mR7hwtm9Gcz+J5F08/AJiXj5XhF1KY+3tIIIm6nynqdNQD4TqsjbOQJlUdPWEFR VBcwKuAC+CPIbXK64CqwWNO5wOPguHD9pv6zM5EmFlB8oGAKFDF4CwuO0vIM9rkfTsyM O0aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BN4Hc+BdfKcsNsw/6ErEfw/2c/K9jmcSQTGwoFL/ES8=; b=OLFActUv73riDEPa5xx6mrBuNNwDZc/iAKZZdwkxE8TkW2rBRHjK2S0PvDppbEk1eF HBmwfR8aL9WuDIN+rpdVzSE38j4QbBSJkAjrvwpwzeYyTGzOzqZI7GMySbjMbsrIx+PY 0kgwsKJU8gwsgjcjPGDUSqwcL+Pb5VVYDXsN1Zn+wWhC8CSm1tuOW9G87mI46cX/KxDp 0J7DaONTeK+MlqdXrBcWa90BbwZ73RSyUeWLTqqMycluIVzBH6+0b1rAzuniHlYr6wLS E0usMv26N8tR7Psi91mgvGw7GrGkU0HrC3JAeJJgIuRRu6f+wZDIc50H2nbTneRyif7J ZBhg== X-Gm-Message-State: APjAAAUvhJEvpiLU71u8bCnArqH95NuNEJKsAsyrrHkSg1iNoLw6CUC2 4wTW/dS2mp8968XdUNsKdslte1YwR4A= X-Google-Smtp-Source: APXvYqwpQFfmZUBqW1NgyKSA8khA6RaQPJfLQXjIv/E7ePWlQmB08k0LzUYzF7iyvIBNFIrNuXAdjw== X-Received: by 2002:adf:cf0d:: with SMTP id o13mr30711900wrj.291.1563371459713; Wed, 17 Jul 2019 06:50:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:28 +0100 Message-Id: <20190717134335.15351-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH v2 16/23] NSIS: Add missing firmware blobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Various firmwares has been added in the pc-bios/ directory: - CCW (since commit 0c1fecdd523) - Skiboot (since commit bcad45de6a0) - EDK2 (since commit f7fa38b74c3) Since we install qemu-system able to run the architectures targetted by these firmware, include them in the NSIS exe. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190715174817.18981-10-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e Acked-by: Laszlo Ersek Reviewed-by: Stefan Weil --- qemu.nsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e0..89c7c04f957 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" =20 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371484; cv=none; d=zoho.com; s=zohoarc; b=e8VQX9/DJMRA3eSlqqpeeqKkzkV6bMgwW+fCYYFITl7yN14izZf50MkE7TTFU2IWTYaijqKM0HNyZONB+DCbFBJRt0ijVyjHP9CS9DXWhRuxzPSYAADmQFZ7ctWDbAjC4nzxXHx2javfqnvj5xOzpw07j1ZdNsrAChLdRkD+YmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371484; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=lbPAsjr6ItIsej5ql5RCAja2zRw+vIlLshIHX5yjpjDzmqJJzeQGA6bh7T1a08jKv3jROzBBFptPYRNqhUKqODgtQR5W+pQFS6VH72LO+Wfwfov5q/+f7xp9CzoUSdRmFUdUWcQj9FUsdYwy0bNLGdzjby45zLBJP9XrYMVMNVM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371484372109.55216932088672; Wed, 17 Jul 2019 06:51:24 -0700 (PDT) Received: from localhost ([::1]:57402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkL5-0005lb-0n for importer@patchew.org; Wed, 17 Jul 2019 09:51:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57773) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X4-2t for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00010l-3c for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:32997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKc-000101-S6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wm1-x344.google.com with SMTP id h19so19232466wme.0 for ; Wed, 17 Jul 2019 06:50:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v18sm24932786wrs.80.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5ADBD1FF87; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=h0TMBYauQel7RhclqI/KijPgCYbscH7rFEJNoFAhX9/PlG1Ud4STUrLFwWppXuyzkj L66e3Mag2hYO3Q7X5gjdlgz3HEFISkzFTsgn7OYodtN0+01IlMZ28LKU2cl6R0jfzCxU Pn1n+qYaVxf4NAbvjsyslzcYuRuE3ZgIggWgzy2EJSBkmxlUw15RyNnSG3p1QEKHoRKy iVyEOCloon0wMQN+78IBYQrbQIDYcwbMeD/iudED8t1u/AvhASwrigh+bWgL2rCLOdJo 7bLJD2YpaAGVwI3HrrZSFHu0zEiusCJwjE7CeLfYdX1mXVQi/m+QkDdzRgDS3vliYiG8 vCPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=N/L3j6cDpO4HyuR8j7d/fMORPUuEpafobISEk4BWVJLiOv47n7QwzQ2wILA842NMiA v7Q4ENrNZc1MzrPmhwIvReBMM9I0bGznHaVwZTPp8G9dnS8BYd/As7JU3SrVtK1wl5UB w1tt27jv65kfRhp6si8tCyrAwPGbdXJOaWTaE1taxSpQOxchUI633uwpM2dO3WcoZ8R0 LfRZ7ED5WfbkoGGu3tnqOc5aSPDWxwU5FksYnK8UkdLr35uYy6EX4dSuC6XOWUrfDj2Y 1ixyUtPAHR/WDPbDUuGPBLkOxhkRJ9iOYI9YqaSD9mIJ/QOiPQHF7IOKTDSrWl4lJNFP 21fw== X-Gm-Message-State: APjAAAXix53p1hexljezGrgRYxa51eGtlmbeDlLfwa28dt2pUvnIQtL/ 0Gln0zdNxgSqBeX8eubTGNA8lg== X-Google-Smtp-Source: APXvYqy0LzzCO8j5dEiC3LzhIE3CwWGr1/D/7GVh/ZzX5epVZqVYaMM49ffmncKhNiduOXTvF3xSbw== X-Received: by 2002:a05:600c:23d2:: with SMTP id p18mr34702879wmb.160.1563371453405; Wed, 17 Jul 2019 06:50:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:29 +0100 Message-Id: <20190717134335.15351-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit 97fd1ea8c1 broke the build for --without-default-devices as VMMOUSE depends on VMPORT. Fixes: 97fd1ea8c1 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/i386/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 =20 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 =20 config VTD --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371492; cv=none; d=zoho.com; s=zohoarc; b=Dy6d9F3ob6yjXcHkwo0jimJIiJx1CRt4P6G0rDLTRErv+W1d4HWxiAHVFhG7UedaaxnFjgC+TUqUKzzcjTohT6RSeq1BWh3nxCilsMjK4N87aYTLSy5kbpBAGFrd1NpEu9iP7pTM5GkUV4Hq1eS7T70xpKld/J5ulfeCWtdbVSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371492; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=g/DSb6tWqteETzN+7Uxg1acBsYp+DxZhf79CM8oNERS578PrMURJSGrzBwrOZmsvGajejZCkvBSKo3U6A5zdbDixeZu6xyuaiGYJb9Iu/UN4og8b6t0L3KIf++mAR6I88rnwSvgkSUBx5l+8dYEsF1AAHfKLa0YCfrvTqckVy2c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371492041820.7108063089119; Wed, 17 Jul 2019 06:51:32 -0700 (PDT) Received: from localhost ([::1]:57404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkL7-0005vu-LJ for importer@patchew.org; Wed, 17 Jul 2019 09:51:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57783) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X5-LN for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00011H-J4 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKd-00010R-D2 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wr1-x443.google.com with SMTP id g17so24928186wrr.5 for ; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h8sm24309259wmf.12.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6DEF81FFA3; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=kDTR+aViCx2mpH43V8HBtoVNYAU0/LvhBoJqXKjq14vMwmObqQgyut60TTV/nSKl7c Vo28bKwkhK0TMBVpZTCPp9ZHV+LcEcVHQkaA4sxtZWbdf2oblMwyb7+YdBidR/u5gLYM m73sLy4RbFHaSDhAvxcAfEE/trK1sGogY+y6JIoqNuxWjwunTnWuf35tkGwXurk5k+SC zFchF6DdX0kCFjb2MFmZ9UfTOxofAX0GU5OyVQds+KvBgt+/uAQUDkwi3wrwgrjluGU0 N99wYEZacMJ1bMrSsMkyjoXmXFaDU0nBNKOfkKhnrD5QGDBPvlAk8O+9XMC8sEfK4u1o 1J2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1LS+KlxpEqELEq9qDHxmPBrdtBLm31lNrlXQcOciuak=; b=hJqqhEXWojfQSkwdUmnBWUKh0NuOgmAPmMrWnlxE0m/3Jq6iuHeQrBO2AaaMFoUR+U 0hIYcNBirj24hGvjF3YRPrsG0OrhqBdlCh0Vg0ce+3N/G7ZZk6EVBRIRdJDmoKWCER+g 7AUjecsykuVzuAWydmYGwUuWnUjkNmyhuDKEJ+mMrCjh9IIHquq+qS8ALEC4e343YuAB URorGV9MZ7+wNcKbuoYs6M6EiqARx2Nh9s6FCKVeLecTewr/cF/PVkKLrtx6Q6BSIgQV t6Kpo4WVwUb3O7BIxeIOxbn712gmzDc9DqxSqX71qmgu7tWu5Ie1mA18jKowZ2CXMF/P qEPg== X-Gm-Message-State: APjAAAU1ePxuTY5ivbFlPafKX7DGeSWcETn1ewEPvCjsMcFb0McIw+OQ pnGU3KMU4uRcF7yyCh+gUgS0Vg== X-Google-Smtp-Source: APXvYqzgSEPVFJtqVZt/Zo1tRISIMbfTLXIBcC5Z4CgySD7mb1nMbWIAVAeOOfc6uMSifi1zWNJuBg== X-Received: by 2002:adf:e8d0:: with SMTP id k16mr43370382wrn.31.1563371454243; Wed, 17 Jul 2019 06:50:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:30 +0100 Message-Id: <20190717134335.15351-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 18/23] travis: enable travis_retry for check phase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 && e= xit 1; } script: - - make -j3 && ${TEST_CMD} + - make -j3 && travis_retry ${TEST_CMD} =20 =20 matrix: --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371527; cv=none; d=zoho.com; s=zohoarc; b=Jbah+PhpMbSlnQNt8GRT4Hvz3+8B9ZtIpKn7Ezkeow+JACxWSkuk5w25eptnO7zAp2+ikjwlMTGXWZhJAuYjVTXaMpEKYkru1LXXAJKWzZQAgiO2j4APcvMvE/i8hWDbKyPMtIVYwCKzgDw4LDyPH6zBdab0KaXo/AY1biygxRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371527; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=QHJzpaRK+VMKqz1uSvxZKGs+zeldgYx1CjV910M9FoVYBstmI10eGYKtNvANCub4qys+qshr/eIBlBpg08iiJt1qPNeRcRP8qnw9h/eKIUhIobypw+Thyfe6fM0WvWfboipwcJjDJsDVgXLCXAO9MHXjE1rMuIUcm6IQaQrpm+k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371527812348.0195321173421; Wed, 17 Jul 2019 06:52:07 -0700 (PDT) Received: from localhost ([::1]:57424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLl-0000Q4-Sx for importer@patchew.org; Wed, 17 Jul 2019 09:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57916) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKo-00055b-2u for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKk-0001AO-9K for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:05 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKj-00017Y-P0 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:01 -0400 Received: by mail-wm1-x341.google.com with SMTP id w9so19231456wmd.1 for ; Wed, 17 Jul 2019 06:51:01 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y12sm2959416wru.30.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 807561FFA5; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=VpcDjBsOqJYKhdBQLS0DZMi1MYane0Nl3uIxl/o/JZn4y1P7SkMx6ectxStRknUxgo J7kpeAgqeGL+LOuXiPK3X3Thm6qFymgOzeEJoau10yjia7Ss0enaT64jQwnDEtbA//Ak jFl/e2O+l9f024HdjrJBEq36YFZ2Sw43LYWiRA2p+180Maq1a1h9Axwri5365VUSUdLg yoTQ0fNqG3GFg5DaX69TceTjaQciOclP7b38D9VtThYFslmaGxK+H577kRog7xKek0kA ZRyM9bKfdLkk4I0WQoceU7uSx6vW5M+ToGaaN00iMyISJU8udDcwEbfzZNen7TgfOtmi /ZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FueVvrQyl+4oa+yjvU/y1NHtb38qdErvOQQrhe5Tnk0=; b=CIbnuKmqNO7H2nVImiC9Eg30qRTdTaWduLHoxGZCgg1wNEqPiDWohT06SZrGp2lkqB xoRwIMqGeJWDJj4Ka1VLjh8w7ksUUoWeh+CYJ5JdxFdL6RTi2ks8vpueo+Q6G3rwBoG5 hiFE/O2ycQX9epvOqDZiyPdq/zQOTvm2xXrDVxIn0MsjCJURlOWA28HnZWmN6l6v6t9O 06q1kuq0C4JRWc2zdicoyuE8xSYYvUC7ct7UWkbU2N5IMxKtB7/77ItsPZ2DW1BstTk5 6vevOMKU7wp5ZXjRQz4sier7FiVlHneLRU+WFz2sXSLOKuwbmSfHI5za9nV1oP4YgQT3 ozwA== X-Gm-Message-State: APjAAAUomd5ihVaXTfGVUyq1uRDOYGYx/7Zj08sD5rFFM/Lq1P+S372J pYmnZMdB4Xvh22oh3t9ZKWee2A== X-Google-Smtp-Source: APXvYqxAuNpQRMgB6s6CcB7GC473zDzcnW/Wtodghlc3/oQxIMRVGQu7jNf6/FB13HRigtp9Z75b8A== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr37937523wmm.153.1563371460558; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:31 +0100 Message-Id: <20190717134335.15351-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 =20 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 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371532; cv=none; d=zoho.com; s=zohoarc; b=U9UT/pFVwl0a/0t6YsvGluulTqJS4uOjjfTVGWj3Z2AZe0KCPqWP7c5BSuYBIJwav862KohbV24eXccyLM7MzfoFBu90jBvNsrC7Ty4XSw0LW5Yd3WSFIzkkv3p2dx0s/6WONIEbZqSmMDJQhMXXetx+pWnaQPFyFt0bn1kJHTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371532; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=NUxdBY/jfjvec8eO1Fi3Dfyg5YpsDUmIZn1ITouX80dVZsAKz7TjzpogjP69XAfBn8sg28NM4W90N8PJmIXJhzZzFmPJYq6Ed0q5DHYLruxpHEInTKQKLy9lOf84SAUd/cG1vlY2jxx0lBshHL2XiRSxhAHpapcXjLQVTyOGwCc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371532915451.8961030233352; Wed, 17 Jul 2019 06:52:12 -0700 (PDT) Received: from localhost ([::1]:57426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLr-0000pS-EY for importer@patchew.org; Wed, 17 Jul 2019 09:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57820) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKg-0004XM-5D for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKf-00012e-6n for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKe-00011l-Vr for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: by mail-wr1-x42f.google.com with SMTP id 31so24964562wrm.1 for ; Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c6sm22425483wma.25.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9343D1FFA6; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=SuUiua8FgyBDal1XtjZN522lafFOH+OattI6ZNjg/Hvfmu5sl0VHqX+PF+1haPCc/m sXQy4tv7IXnhygMNpdIc02smwP2otyqT3v79mm8vaXo8YrYRhdXAMXzRFWHbcPVIjP5U GYyphmMaSAeFMUWXWpYASOCa7mFDy4RlcDNECxn72IZfmNQ4Ihjxf3AC7gu2TkseQDPz 88q9eT8UMBLfmN9cHeFr85kvaqpqTk5UQO+FUVmOeWlfRsceDC3tH4ndtf7FFeP4dl4W wygDokojP4ntMDAF+653qEC+cpCtlXvNFmedhWXBHyKFnFhlVdWiqk/r5/L2+ljWY0V2 wu+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K3Wy/ye/eKVXgXA5uUlnNSPRyeCvrtd7wt/0KqJUCpc=; b=WYDfqp/Zq+QOpJZ3BzDU4X3a8svL403qZnE25+ANXpXCX8RJEIbbiZIaG8J6DlrM0C w6j1YwHXPF6y8V8vVuGZwXKpsm0LviZ1gOrzkWmm8LeZUgCHGcdo0WnIO8r0M+179+It feTT1RoBLaOTougpgXxI2X1+aPmimUJdALma9Dq/QHv1LVGXhwM2NseWk8rVY3JVenvR g00pOEJOQ6MQoBRpJW/Gkv43X2+BdbVwNoKfxmwkkeW8XxU3YexzEOg6WUfJ39rYDAed L5ufOIfI6cYNnlVGGCVVYYvglI3KJVzhCEGWAcdccjnWt3eSDJjm8CiGqrdiCeyWhHWK WTVA== X-Gm-Message-State: APjAAAWkXZ9hWYDYbFI47E+cEIH5vYfm9WyHWSGBhepHCodmCVZ+SJHP IYBhlRHmciM7UiTryVCyDkra9A== X-Google-Smtp-Source: APXvYqxrevXP9Ss97FaL5bURFIAvNNj2oamCqJw+O93Ac8KqbkXRTQ7v3GtxteMBMhaviFNkoQcquw== X-Received: by 2002:a5d:4108:: with SMTP id l8mr42603309wrp.113.1563371455854; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:32 +0100 Message-Id: <20190717134335.15351-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PATCH v2 20/23] tests/qemu-iotests/check: Allow tests without groups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Max Reitz Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-2-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/qemu-iotests/check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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=3D'$start'; t<=3D'$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_iotest= s/group" >$tmp.list + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iote= sts/group" >$tmp.list fi fi =20 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371601; cv=none; d=zoho.com; s=zohoarc; b=m+BCSs7qivEyZYRmsi7xys9jkZz07PFWT8FitPZR9JXeZT0Jhe2vZPwbcvz53sKsfKP97SzFBf0DmBZtdgAvphMPgdB16A4aHf5PYagpQlzmUOcApp7llZh8MuzJ/RRJhg5IfR5fKP2q7WGVGIajAPk5pLVlSUW+Wy5wXq73JmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371601; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=H2eyeV+eINKBz/tVBijqaJY2gejyd+i16QKAWz7iHKlCfWfKpm++geMsHs8JYFivYzy9orTRJPbGk5ln+BhPzC43ABCqu+snEvHZQH3AMzLEBTA/9/xpC9OBBHVbx0jQNGcklCAyoJ9wRLw3JFa8wYlGcS4uwgUIHe568iRJ8dY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371601433247.5427226218876; Wed, 17 Jul 2019 06:53:21 -0700 (PDT) Received: from localhost ([::1]:57484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMy-0006ND-HI for importer@patchew.org; Wed, 17 Jul 2019 09:53:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57920) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKo-00055f-29 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKl-0001Ay-7r for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:05 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35160) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKk-00019H-MV for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:02 -0400 Received: by mail-wm1-x32e.google.com with SMTP id l2so22269321wmg.0 for ; Wed, 17 Jul 2019 06:51:02 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f7sm22895318wrv.38.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:56 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A86651FFA9; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=UOImIFE1i9copiUQ7JsGuIM0m4jn8j/SNuQY2sLPSDGivLvGd91onzY8uHn733HHNX 41s1rhQEwI6HP3zuj5uDnM2GahtYFv5shmyxR/F64wMxH6O71AxHLZZWi8Bl5HoU7Ehr TLYLJ6yaHbDRDAwue9Zx7430ZQyq6fobAtyeUrXM7jODKdsnbjgisW+vhkggZaEcrOW9 KVWScxyjIZSYglaUjmdS3T6kaHdQmthgO9EIQ0mSTsTgPPiho94TCmKzcwm5Dw6urNi3 gOuCuEKQtGjpgZPs952Y4t7MhAXBrlOWRJtXASsgjk2HdXWg13KCNbcyJ+PnU58Glfc4 egvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=crZ71qNCKrxI2SK5mNMQPnlhBY+jJqxNnU6b4chr9LE=; b=Unahjun4kh5W6mjANxU8jV+NkN82c4o4m1xJaJbDSmR0BY0e/cR+uZMeO18nJATVld UYpEga4zUJ5hKWJJ+g0I1p1WS54laTAEsNVui1TmngM2pwqgIyK6J6/b5uDFf8NjzDIz FBKlnmJEObJf4j2Tk9K60hMgfe15yI7/gTwKJHXJET3HDp75Ahqbzr4fo08b/o+IdQgb 9gA6WyoFUoeu+bLu4X9Ne6IhO5Fg3BB+UGsNanRhRFUaJQYPh2p/N6tJpruCbNDV60U9 9lo1Y/iawf9b5Ysa1OF7tWdQD7ClYeQET+AUc151ZCH9K+G7CiTs6UfkMua6I6U0Dj2l bwhw== X-Gm-Message-State: APjAAAXQBDiAVIS2tf/NkjsKRX/EmoDjZtYRCUeP3qlfYk7aB3dEtBN+ xeMKrzOXuUza69S0M4E+yqDlQDcKUWM= X-Google-Smtp-Source: APXvYqxUWpRauHd96a8XCIbay9J5N3s8la1QQXdMrFVoKSVzWxmb/w0yEUWb13E7tDCwyVvJ8VuWmA== X-Received: by 2002:a05:600c:20ca:: with SMTP id y10mr6538728wmm.72.1563371461053; Wed, 17 Jul 2019 06:51:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:33 +0100 Message-Id: <20190717134335.15351-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH v2 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e --- tests/qemu-iotests/group | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-) 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 "roo= t"). +# 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). # =20 # @@ -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 --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371589; cv=none; d=zoho.com; s=zohoarc; b=VmApy1DkYvGAZyEU3JlYAFzbSGVUkuSevaVGdfmVIAbMYAqUQNUJG0CDViHH2kzCgNMWJ6hCMqCh4nuPp7IGdx+PpZHSZBAGTSCapEGMgwvuJLvu0ysR96Bze5tXGXY+HeoIfMEpllt0ntQs2KQFfjMq67UEpIfv9/fEx5h5tDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371589; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=RSimGgLcYMLGBl3AP6zfDncdGDnG5OlMgiCJol/yMIl7C7hgS9uhnr69+jQAvi5+jOzks/bsV5EOBUJ1fLPmYfBCh7id2ITaHNUhT7Bg5ppzhnYOUDG5WbuLi25B6HgGo1kPpK7y+wrhhR6y/UeVBjyx0fyXxP7EjLUeuKQUtzM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371589002738.1142784999768; Wed, 17 Jul 2019 06:53:09 -0700 (PDT) Received: from localhost ([::1]:57476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMm-0005Pg-1V for importer@patchew.org; Wed, 17 Jul 2019 09:53:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57892) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKl-0004wN-HE for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKi-00016t-Jv for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:02 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKi-00015c-Bz for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: by mail-wm1-x343.google.com with SMTP id v15so22273056wml.0 for ; Wed, 17 Jul 2019 06:51:00 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 4sm53933619wro.78.2019.07.17.06.50.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C11881FFAA; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=vfgGfA+0cUbAZ8WOL5VGfN7Yn+KIvSpudPq/bQyO0Y1foDZrOpJnmE24fG68US1ShK IW9uitMI/Bc0oQW9JltinHJgpNKQh9GRidGwXdZxe0dH8oSDDGpWSoNooEaiDl7tPWNx VqsP/BK0n2IvD+ijPxJzx/i1/1lA3VGTpBPkgKtecJp6EJXFu7+BPffnm9Ti2AMZs7CC ZGIplavUxCxnPXcznEANH3tJn1n86/CRrSlV6Kbq/DSlt6Bx7od+TNzPhJCQtyCSfV6s +1miIL2Zv7IQPv3VU6Emvo9XE81haDkgjok7Av48DrQCMxOaa4VsBFJ5OMY9enYDXXUx iyLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r0APmCoUIG/w2qLEz3oEEruxZ1VMqL8sI7RlOiUMs8k=; b=aup7bAYOi8Rsiy41ZAtmvi0ZhRfxfk0gWXk3yliTD70UKlcSvtkRSqpdICqKGpZARH Uquq3bxHXGvyoHjVpKEpX3lGaPByapWtlQ2KE6luHLlKybV1sbMYv9DjfRUYAJGz/g3g hY5+tU99pbq40dQYscrpGgjSig2GW+rt0GPKXVy35AWL/7TaL67NiqzUH74hBh5yYvoi 1UZ1eoCNtNdX4NNmvipzKvroir7CRk2xYptd7V6WNMga1q/VcEHX9GNpuuGFSQ8C38y/ rveDV+UqalSaZjmP+fQqMR9WZDnzF4/tNrkQdtqBybKQbKNgbdXAD+aoZ+75+JvOsjt4 jU7w== X-Gm-Message-State: APjAAAX8w2aG/TqH5vIqwB9K3e7BXen2MyCD72zYZmEi6tISpI2sW6Rx 8y6QIPUDf6u8rLbnhHdU5IgI6s6GOwA= X-Google-Smtp-Source: APXvYqy5SooGQiYPcSCkJYQdvhobVUX/EClRJs9hluw60EKV35LcJkOw+OBbdPKCGrTD4YMZyYufHA== X-Received: by 2002:a1c:f90f:: with SMTP id x15mr35821393wmh.69.1563371459136; Wed, 17 Jul 2019 06:50:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:34 +0100 Message-Id: <20190717134335.15351-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v2 22/23] tests: Run the iotests during "make check" again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Message-Id: <20190717111947.30356-4-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/Makefile.include | 10 +++++---- tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- tests/qemu-iotests-quick.sh | 8 ------- 3 files changed, 40 insertions(+), 22 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh 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 +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 -check-block-$(CONFIG_POSIX) +=3D tests/qemu-iotests-quick.sh +check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh =20 # 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) =20 QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D te= sts/qemu-iotests/socket_scm_helper$(EXESUF) =20 -.PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(E= XESUF) 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))) $< =20 .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-tes= ts/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-deco= detree +check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t 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-$(tar= get)-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 =20 -FORMAT_LIST=3D"raw qcow2 qed vmdk vpc" +# Honor the SPEED environment variable, just like we do it for the qtests. +if [ "$SPEED" =3D "slow" ]; then + format_list=3D"raw qcow2" + group=3D +elif [ "$SPEED" =3D "thorough" ]; then + format_list=3D"raw qcow2 qed vmdk vpc" + group=3D +else + format_list=3Dqcow2 + group=3D"-g auto" +fi + if [ "$#" -ne 0 ]; then - FORMAT_LIST=3D"$@" + format_list=3D"$@" +fi + +if grep -q "TARGET_GPROF=3Dy" *-softmmu/config-target.mak 2>/dev/null ; th= en + echo "GPROF is enabled =3D=3D> Not running the qemu-iotests." + exit 0 fi =20 -export QEMU_PROG=3D"$PWD/x86_64-softmmu/qemu-system-x86_64" -export QEMU_IMG_PROG=3D"$PWD/qemu-img" -export QEMU_IO_PROG=3D"$PWD/qemu-io" +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then + echo "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." + exit 0 +fi + +if ! command -v bash >/dev/null 2>&1 ; then + echo "bash not available =3D=3D> Not running the qemu-iotests." + exit 0 +fi =20 -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 =3D=3D> Not running the qemu-iotests." + exit 0 + fi fi =20 cd tests/qemu-iotests =20 ret=3D0 -for FMT in $FORMAT_LIST ; do - ./check -T -nocache -$FMT || ret=3D1 +for fmt in $format_list ; do + ./check -makecheck -$fmt $group || ret=3D1 done =20 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=3D0 -TEST_DIR=3D${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g qu= ick || ret=3D1 - -exit $ret --=20 2.20.1 From nobody Sat May 18 23:14:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563371561; cv=none; d=zoho.com; s=zohoarc; b=HZ8uPf1DvrI+GnjcY0sMjFFQ+53W0aXhku37nMBZXvPpfLN2QhmMGjGKsH0DK2QEA4DcLTnHK1DODLwp1XrfPWPyYUgJSVNqzsyBUMPfGNXETPfwLHN3TrbIclLRe2UKOToIqRrleLkZKiNfdv4eIUFktM/jZ7XECbIG4niE/JM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371561; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=jRhqVSYngzLqsvZ17Ae2CJ03drqd+ec7FBwqLoMeuuracemPQJBUOFFz47Jz1vvdh69OW3KtNMFAUIpjmPj9fJw5p1zTqlo1Xh1dY9A8bpd54OtEzyCAa6mMDCtOSbb4SMOKV98vndfTBs11lcP6EmKsCdF+hVwL1bsRV7mf8yc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563371561915385.4578091749887; Wed, 17 Jul 2019 06:52:41 -0700 (PDT) Received: from localhost ([::1]:57450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkMK-0003Bb-Ev for importer@patchew.org; Wed, 17 Jul 2019 09:52:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57852) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKh-0004ck-IL for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKg-000147-Cp for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:36902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKg-000133-6a for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id n9so24926654wrr.4 for ; Wed, 17 Jul 2019 06:50:58 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j33sm54337220wre.42.2019.07.17.06.50.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3A5B1FFAB; Wed, 17 Jul 2019 14:43:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=uMHfX8ggR2y00Q+pn6P234+XW1MxewC/5h9U5RsF4QsKLWwtZpqxg9j6SCztdR4uFt ZxIOFVgR2cFB+RNb+DaDHVYKdGRAgZs58XjmjiKaR25DRnck0I2QfhkpGl/VDGgUgeml UivvAfyqK3a1sE2SjUWv/Td8GrqQkA/LJ7zpNZWTY8cVYRBFplpMdGt2fiZ2BDu3ntr8 d64va9cLeMfx68ZcREi6oTZ/qkqsY3Uhc7C4OA8pOr8ZKfHby4chNT7vrAbWfIPKYON8 raqML6bWgBQ75q0Ph2Bi/dbvlDDCjCJQMWUJazKkVk4R0zTkN4XSExQH/989HXVNNwkM Ht9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pqoBdfyfQ4n50onawoU/FS48FgTcxwkxaKzHr93XtPA=; b=Yi9VfkzVZnl+RluuAXsOqv6b/miQ9BkH0BRhqjPrn6bGEBaTGrz5WLAJNLKlmCbM1K 9ih5A50kqRh+q7fao27M4qpbnE8MhnSIk5CCMYALO7MTmFdQ6gAoAyiGU5XT2/IU1bM/ mU8jAHp1fwJjNVy45pkocoXkYraPjKerWyI4tsJ6bNK4P0firJiN2RIBswHy3QyFi8/u 8+LfU7R13U4MzqkTCSA4Dir1nAPJKINSwzTutTAq/bdHj7tSAqpf7s9KcaAyeYLiHbX/ d/qAC6wtPUed3kO5Hs1OqI4vAd0Ewe9/camnHGU96IdcmCwAvBTTjEKUw2WByelBysW6 iq7A== X-Gm-Message-State: APjAAAU+ONpqgIcgkcABmtZKxcOUOoa2YhAiVWbPKEQ3som3fWQ+UBec 1w8oBqpgOBxqBRfTvArBIeiPoQ== X-Google-Smtp-Source: APXvYqxAw387F+m/llJioEjxfUnUpGWilInRJ1LROWQ2HGzHVPNbbrLhpTFBkw7UjzN7ZkqwANlMnQ== X-Received: by 2002:a5d:4212:: with SMTP id n18mr42140342wrq.261.1563371456935; Wed, 17 Jul 2019 06:50:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:35 +0100 Message-Id: <20190717134335.15351-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH v2 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 >=3D 246 instead. Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-5-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) 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 22= 9 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 =20 build-user: script: --=20 2.20.1