From patchwork Tue Jul 17 19:55:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142201 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4070511ljj; Tue, 17 Jul 2018 12:58:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcPxICdIx0HDZ/zLiwNKorVQwu9YhLnPs5Fww0ReI7v3194wzj0/JxTLkCL05DXEFKY+6iW X-Received: by 2002:a37:2b28:: with SMTP id r40-v6mr2942338qkh.286.1531857535057; Tue, 17 Jul 2018 12:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857535; cv=none; d=google.com; s=arc-20160816; b=dYvWIMSt6Z1WPD8xzgMjWKMYc/r6w0zhYdQo1LqdFcqg68O1fmppTlyFsRuxuzmawS cf8WGD0w3xdqghpYZCpMA+rKN8fIbvm7a9i6PjL4CC5kbAMRIT5W73FGG3xlUqrtC27t jRCUFvmB6v6tvaqEamK0R59/yFg/VtE9Jbl+R/HrVDHvKCvauSNwNUSxeK1qxKzovCZZ O4lnRvXYLxG1YOTdf+G4Brnq77wopuVzdbNA4OEPq1KX1Csi9ftlfxAF+G1nm95cm0kE IDo85s9e/IFmLVWBFJPCINlF9jxleiWZdKQHbpQaPp/LtL1mgkcPjC0HIkNp9s8Zq0/r CiRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=s3ZyxBxzau5fUOt7z7GIStSIk9FwlQTjG9bixKYj8iQ=; b=0GIDoLBPBIwVxvA9vV+k11ve8FfpYhSr/Lxsfy7j1qXB07Aqi2YKqa/cKOK3ARr6T7 /RCV6lvhGeUDDm/eZJcfYqVai17eFnGZGqPpU4YOQC5WAMi/+eOazNWAOgYi8QYA0VbD 28Rorzajcshb4z+9UD1J0vHP9Z4IkdfdNjfVpapDRMfOvXAikMce/0X1VH+/vLfu4avU lL90Pf/15sgPYqrUS107HwBjulOSxH0iEG4CtrY0BdDbc6mO2hFP8c0R9yjYrqF/BEDp e8tZ8oVwhPHiHJiSqEpXqwzGOAH2Zfz9+B2uCWQoMPHlOyDezIsH6WHCQsDX7+FrwFVY PX6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gO/S8NK+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s30-v6si1667813qth.284.2018.07.17.12.58.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:58:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gO/S8NK+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW7a-0004BX-A6 for patch@linaro.org; Tue, 17 Jul 2018 15:58:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4n-00031Y-Sz for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4j-0004ZB-8x for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:01 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:44309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4i-0004XE-Ld for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:55:57 -0400 Received: by mail-wr1-x444.google.com with SMTP id r16-v6so2374310wrt.11 for ; Tue, 17 Jul 2018 12:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s3ZyxBxzau5fUOt7z7GIStSIk9FwlQTjG9bixKYj8iQ=; b=gO/S8NK+tXoMWJaK9IFH0Gnh5okdnjq1FHq5/iGGbL4LeVjVNh/6UAMUpgRY6W2RK5 keCC8v7YBNqOavcTilIzMMPBc0EwjG+DuY1Z19sxXuEwQciBA+tGPsTqH8N0HXHLIUS2 KLnodbCJZ3bod1OFWKo7pgOawLk3+h1woQXu4= 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=s3ZyxBxzau5fUOt7z7GIStSIk9FwlQTjG9bixKYj8iQ=; b=k14ejWpKiEP/Jm7XucDYv1Jwo6B9o01UwiE1rjiGogHISzlbW35LfmpVMtoGuWQVPP Q4h6bVWnKQamSTy/ATScybxsDw6AR7WDU+okw+DA5j4VN40I8RWtFR9XeU4ASNXmP7ch YmxGk6+9Y6ZO5hMrsi19NIGYS4NPAu6kWi5tJguPX/JIGMZILssCp3go3UVdMbWc7MYi 59DqLpzvwVXUaYMof5EzjlYv9Vbj4PXyJf0XY8V2vWP051Bb5vSIyu7SWuxBBcJuLIEa NNQO/NTsVCGfLA1W/cKLFMz3Ag3ftfJrzprgaC1+lulIU8yQXCUFbY6b8/JJ9kP7NBih D5BA== X-Gm-Message-State: AOUpUlFYVY0iRKGd2YKMhvB9HUevAlEsvLhRJtmLRj/i22VfPlANWksz eO7hLAIOotZxh4GgXjn3lMIE1w== X-Received: by 2002:adf:ee4e:: with SMTP id w14-v6mr2443079wro.63.1531857355182; Tue, 17 Jul 2018 12:55:55 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b123-v6sm767215wma.24.2018.07.17.12.55.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:54 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E935A3E032A; Tue, 17 Jul 2018 20:55:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:36 +0100 Message-Id: <20180717195553.9111-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 for 3.0 01/18] tests/.gitignore: don't ignore docker tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The .gitignore was being a little over enthusiastic hiding files. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- v2 - minor wording tweak for more explicitness --- tests/.gitignore | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/tests/.gitignore b/tests/.gitignore index 08e2df1ce1..72c18aaab0 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -9,6 +9,7 @@ qht-bench rcutorture test-* !test-*.c +!docker/test-* test-qapi-commands.[ch] test-qapi-events.[ch] test-qapi-types.[ch] From patchwork Tue Jul 17 19:55:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142202 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4070533ljj; Tue, 17 Jul 2018 12:58:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfa3W/8nWBSCCVZisEaSKfwGTyAawC4R6qJ7rdm9i+xk5qdOdV1JnZ1RhaJaCCOQIdDJ4Bn X-Received: by 2002:a0c:85a3:: with SMTP id o32-v6mr3433538qva.62.1531857536046; Tue, 17 Jul 2018 12:58:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857536; cv=none; d=google.com; s=arc-20160816; b=iIWyBAoqxkXVj+P9LtZjDMj512nDlxj5GR6I8QOzWnsvBG2+e12TI44hCb9yIjtNBM RApAuzQMPQqxDiVpC9IwGji2yUVTwyVK2hrzpgJvQbCwA6A/9zpEfQI32179C5viUHJ0 jDN2ZSM15EpnVoHwJQ089IlULKXqVxHokVJ8eSHVb3mqKGE7ec/R8ilstx2QDakvLdyK loM/i0eJ5p+g/0mrnzbcs+xyp98WXG5MXzIEX2/C5DFqS3tfmRRbLhaQg/YMDxK8wUfw jFElfmHtk0LixiP8OoZ9j7zPKnqePhkeXfb56pDeaF6f/2oQqstb31CP5XiSHArDNxc0 0xFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Tc2e5a8d48MEzOzwrg1xBMGVNuUMa+bkRtxDAPew25A=; b=UgBUasJ0Movmo3p0E49mBRn8AdFa4/vh1TTNUraBwqKackyDd4csG/GmdGQ5vKfgPu penGbgSCykjFEL5xpicghSTT8okChv1p9PtVL9KtZCEcKQtuwRkKOhqZeXarR2gzZ62b KLfPPHWGr42JKQlbAwa1ED/qZ6o3cuiP5zzTc2qK20HYBFM56R8vBQLJtkSHEBX3FSX9 FnzZHkN9gXIfmpHKelSpTkg9+Xb//nhlNzaoXHNKqghoHuo9Fc3bFfqGkIWy5OsKMKwa QIA/wrcTER7In1gY6dYYZfRYpOF3M5Y/PVNYi4pb5mi8x/k2mKmN12lw+xXrhh7hkCNi epyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KNcYnd/B"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k3-v6si2064768qvc.79.2018.07.17.12.58.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:58:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KNcYnd/B"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW7b-0004CP-Ez for patch@linaro.org; Tue, 17 Jul 2018 15:58:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4o-00031a-3j for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4k-0004a5-AP for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:02 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:53468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4k-0004ZW-3P for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:55:58 -0400 Received: by mail-wm0-x244.google.com with SMTP id s9-v6so535500wmh.3 for ; Tue, 17 Jul 2018 12:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tc2e5a8d48MEzOzwrg1xBMGVNuUMa+bkRtxDAPew25A=; b=KNcYnd/B7gtI8+hoH7M3MJgVJxTbiGPtQjjIWXnL19azlUJHkiCBB5hwsZ2kh0OMMv +kjsRZ5HNbJVsA1kZz8JVIObkpGnOdn/SLRXH6/TVd4Hlj1x041cpZOWz/Xz8eLan0NJ V6fYyjX+GbK/OLzSbtexDapRkKnGdkYlxCWUY= 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=Tc2e5a8d48MEzOzwrg1xBMGVNuUMa+bkRtxDAPew25A=; b=eFa7srxWlOnnqQitsqYyI3/uMv/Egiy5YE0GiMQV6tvTlQotYqFiPox9+CdaCay9gP OfBX4NCg5hmf3ZQkqtDjkzPVIfqbLhtXl1n6IBWYznOVmUj323t9ahmqcnZABaF3K8an KKcJkny+2upsr7oQAIcVlvBPXsNM8SDvKSM/IInDZjRsCFVjOt2GchKKfxpmRpr82N4q wQsE8NgU54hKxA2fVKkz2N0Y9hp5/SCwo7kLpFY1vfJigINdDFBzDE9pCcf5j3J+3a7E hJbDs8/F/7hPJJRrzKLeVHuPYavrd1QZSsZPb3ldQEhZdj4L7g44f+aVOc6xcs3BAUP1 sabw== X-Gm-Message-State: AOUpUlHqak20RoyXRUpgGPnCaSG1HutR7zhWrjWg1srfXzYjwoeoGaWF nkR+BikoBeYQHcKEVTqFCK2TRQ== X-Received: by 2002:a1c:4405:: with SMTP id r5-v6mr2092044wma.4.1531857356838; Tue, 17 Jul 2018 12:55:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v1-v6sm4161508wrs.34.2018.07.17.12.55.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 07CFC3E0496; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:37 +0100 Message-Id: <20180717195553.9111-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH v3 for 3.0 02/18] docker: base debian-tricore on qemu:debian9 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need both git and a working compiler to build the tools. Although the qemu:debian9 image also has a bunch of extra dependencies it would be fairly unusual for a user not to already have this layer available for one of our many other docker images so lets not complicate things. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 898b8dd511..180ca646c8 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM debian:9 +FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé From patchwork Tue Jul 17 19:55:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142210 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4074695ljj; Tue, 17 Jul 2018 13:02:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd+8WagFnFoiiO++T1IJVcn71h8/7qyvJBIFBFewqKrWdXnvty+k4IHe/6iVf8gkG63hoWl X-Received: by 2002:a0c:f58a:: with SMTP id k10-v6mr3347169qvm.225.1531857761629; Tue, 17 Jul 2018 13:02:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857761; cv=none; d=google.com; s=arc-20160816; b=t/4SyWBbFK2+BnYtkStQ6AEResgffGSLF2n9YLuDyoP6TbMzKIBoL1exkeglRE3hOT 4yFygKs2ZbXEK/7heGB1ZboX3hIk2TbpjWMAOYnkVIWf8w9oHWIcjtIii5nPZzBz12bl 5bS7VC2rDSAl2VF954jmyfv8VQrvtEg1/GodoqbBnIHaRncYb4zp4xC4PdkLQQjSUamU FU5xYz76bPAQyFfpu55LRq4hcJkChAnnPzleEvOZS4WzkdR/w/+6O0r/clZqyR5FsuTW 17nfZJoHkAUuHiM91XlnTPfMo5JjH3sxEYUUiMzgMK4nsXUD6FZprUHk/pxiNsYyKuM2 ZypQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=sJyFhxSb2jsgxAypgZ35kWNGgzJsNtTpYMIJenEd1Qs=; b=DN2Owe9KjulLlRNWvNOlDl8LL4E6Wj+H2Xw7u2uOSas+63ftcJlKvrtvyZ252XkWQt N2LaqxQaEdlRBXN/2w4klfo1FR9LZ3ppQzZsjz1vbZjXXmeXHkBHCYHWEKcUDGXYqzZH 5dS3VpQ+tCIYj8egTGaqKL22tT+CruxnhM2i75iPc7MAWWJmkIh9hwFScUsNd4/kcm93 +MlvKKZQ9/I5/NuXEm0gGc6avbONqwLO7bufkM24pC4uZmiwbToWCl0D+JvXfoktRAPl sPe2pbXBkaKgFLnAgmNBDuiWoMSeqAsTS5jDABuQhu2cjYt8TnDLncVOxDGSwlyX7hvm WHuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="kK2OG/oS"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v21-v6si1642145qtc.391.2018.07.17.13.02.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:02:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="kK2OG/oS"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBE-0008Sf-Ua for patch@linaro.org; Tue, 17 Jul 2018 16:02:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4q-000324-0p for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4l-0004ag-0g for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:04 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:54172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4k-0004Zz-Q5 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:55:58 -0400 Received: by mail-wm0-x22d.google.com with SMTP id s9-v6so535518wmh.3 for ; Tue, 17 Jul 2018 12:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sJyFhxSb2jsgxAypgZ35kWNGgzJsNtTpYMIJenEd1Qs=; b=kK2OG/oSVeTNZfTyVXzofywKnHNTq+WPqCRMl6giUnlN6KNlmHXXmKkDFxuF1kh5Pq NCbOl6djs14Guv1wu2Oi7AXi05FWctWQAD3jFngqBQjGDkjVyOrWv/9VrRGiIvq3viCV WAiH/sZ8RhtbFbXdpk9T9bdbyo+IZPg1Jom8A= 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=sJyFhxSb2jsgxAypgZ35kWNGgzJsNtTpYMIJenEd1Qs=; b=hS/IR84G9CiBpsKZG/irraUe3TvuVjnC52AeT7sdXxyKRleomx+HLEtIvZf6p3VD0x IQKLgmYdXmC/TfbX0MTM1Doq/64BZOEARSKjZZXr+edv7ZcFborpIEs9XQQtRf2Glf4f NA/LP6sxwQxYMhnJth7K72JsJtLV57iObx+2ZdO04PthBRS2/1bLTYT61L/PxR8UPYuL UmMiJMb7jzOG3hiSCeSFsYeQqvSmEGpKODqt53y3wsW+wjIR3+OsD2PznhBIO9FVcaKZ rAMqK7idWjS7M1RYkjJ+SaI6atXRC6b1x+9pMMEdknyGHsNmBSjas5vRpi7o+xyO0NPb oNnw== X-Gm-Message-State: AOUpUlHLHeC7MJRwuqMy0cmFNKv3EJcXUtkgOkCHSo2LO0MCXULwTSqc xZrEOYYc8kN7Hxkl1+ZgwhsxXg== X-Received: by 2002:a1c:7908:: with SMTP id l8-v6mr2145501wme.80.1531857357625; Tue, 17 Jul 2018 12:55:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l15-v6sm3401352wrt.67.2018.07.17.12.55.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1A1473E04A5; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:38 +0100 Message-Id: <20180717195553.9111-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PATCH v3 for 3.0 03/18] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This image isn't going to build anything significant as it is just intended for building test cases. In case it does end up getting inadvertently included in a build lets aim for the minimal possible product. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/debian-tricore-cross.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 180ca646c8..4a0f7706a3 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -19,5 +19,5 @@ RUN git clone --single-branch \ make && make install && \ rm -rf /usr/src/binutils -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=tricore- +# This image isn't designed for building QEMU but building tests +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user From patchwork Tue Jul 17 19:55:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142211 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4077641ljj; Tue, 17 Jul 2018 13:05:40 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfNiT9cAX+eYTEL2KCRZppb4WGJERsRcvKDvBbFji5LrImmM79PQ/uPF0JqNRwiafFcCD7x X-Received: by 2002:a0c:e5ce:: with SMTP id u14-v6mr3372392qvm.6.1531857940520; Tue, 17 Jul 2018 13:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857940; cv=none; d=google.com; s=arc-20160816; b=cn36seXda7Yg/gXBAOCBZawlmNBvMyvSBRNjaUND2HYq5R9lxhOq/htLtbj4wsmDfM wICzkrzH57HVZ+LPV6seG7j788rq8gNdJ0SJ5KDgbjbw+kIXpijO4MtgcGYaE2kk0OBC MzkSWIrc+OrIXSxAuGNT9hxpBXvTv6lMNWYqlpFhFnK3x2N3+nKVPGcefCFMULqrcdc9 aXR7rJYIj3XAWsaf7c80xGr+azL4GpAyqArlR9T33+Hntf6ZB9VisiJNMLyTmXDR5fD/ STYCxYFr6fiU4MkCzulbgug/Q/UCKsbBI4lAkhOQxoraxitdUqICvHKCwDTTCA+SYhbU P/5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=iuLXyrPnRE4rW5eg+qwTCiglTBSrKh3Lyhji9XKfoz0=; b=QSLp7NP8EObHZy2Kqe2AmYGniihp5k5H6ZtcntA6btiTxLnwhIsQS/rW3SqaRExj6v 00LnvuiDEOEzPp5SSxAZBr+U1OHgMIM1SPhtgXNe9aHERRmB6Vak+xRssuwiApFR7EU1 kwUwyyzw+0LgFOUiCJTtEMFihtr4XivnAwAFehf8ywysmbCY0dlOc2JebnpI+ar6d14e +no8u674NNLk+IDj0Pa6+JnpweAA1qKnAW8+doXV0oKiBx0HH1KC9i4pcpgLojoqsgKs XT+1aCN+2/F+Fv7axDZoJ5yiNY/yYyPR5J8/BY1x6vhBZM+CAVLIFar3wlai3wh1rTCm b+YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YH9x2KDl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 33-v6si1655342qkz.366.2018.07.17.13.05.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:05:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YH9x2KDl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWE7-0001EP-Ly for patch@linaro.org; Tue, 17 Jul 2018 16:05:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4q-00032b-TK for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4m-0004bh-Cv for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:04 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4m-0004b1-5w for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:00 -0400 Received: by mail-wr1-x42c.google.com with SMTP id c13-v6so2397702wrt.1 for ; Tue, 17 Jul 2018 12:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iuLXyrPnRE4rW5eg+qwTCiglTBSrKh3Lyhji9XKfoz0=; b=YH9x2KDlabgnoiT71hu64OEt2qfKy0sTJyFwH8SOW0d1iKlEEPYoFw8Ze28IaNQQ2Z 6qPsxv0AJOrOyUY+3zqjS6mH6hg3la/TDTKg0T/fqV9QZOWne5/sSJyeeF9NwI7x4C2G Zop2ETdSqMp1lWrFqqdYUSdqQwY15Y5kVkjdA= 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=iuLXyrPnRE4rW5eg+qwTCiglTBSrKh3Lyhji9XKfoz0=; b=grExH4xFCJ2CCNJclR1/PDXELJ0w/C1HHzfpxAzU/RQ9XtL23tlzCIDtG9P7Ck35Do d4b12gmtLbbJGEuFoBj8Wch57z4BOctNM2lQV6qBNuBQZ0CYeQSVeu+WqD46FoyMhPll OdDVgvs77QDKNObyOLdvve3CXNZyH/tQUlzYpCohwp3H7OuOx3GtDGK3+vfHGvxYsN84 szVPBw8zDn1sgbDUKtqGKss8JVJVRNmT6s41wrfKzxOtd1oy35+KJzf8Jh+yze4Akn5u ZAVVev9oZ+sq3T1KEGoicN5oXpnG7pFea1U79BUvaaM7RLsQC+CCkxEbXfDfYKIkmJCK Rqhw== X-Gm-Message-State: AOUpUlHQAus2b3r6mfPRkXCTdFsBeEfXKhpCF5HNQh7cZ4SbbG0lvaGj 8WKvidliHURyLb7pS1MgJcKnsTC7UYo= X-Received: by 2002:adf:b112:: with SMTP id l18-v6mr2456648wra.101.1531857358999; Tue, 17 Jul 2018 12:55:58 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4-v6sm3254189wra.3.2018.07.17.12.55.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2C9213E04D8; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:39 +0100 Message-Id: <20180717195553.9111-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PATCH v3 for 3.0 04/18] docker: fail more gracefully on docker.py check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As this is called directly from the Makefile while determining dependencies and it is possible the user was configured in one window but not have credentials in the other. Let's catch the Exceptions and deal with it quietly. Signed-off-by: Alex Bennée Reported-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 69e7130db7..2f81c6b13b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -479,7 +479,12 @@ class CheckCommand(SubCommand): def run(self, args, argv): tag = args.tag - dkr = Docker() + try: + dkr = Docker() + except: + print("Docker not set up") + return 1 + info = dkr.inspect_tag(tag) if info is None: print("Image does not exist") From patchwork Tue Jul 17 19:55:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142203 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4070558ljj; Tue, 17 Jul 2018 12:58:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdnHFUA+cmidj9TptNCAChzVyYqvryUP8OndbAaTqMgwG7QsBAyz57vYbJVIMWET4FCxbQv X-Received: by 2002:ac8:3346:: with SMTP id u6-v6mr3038457qta.182.1531857537948; Tue, 17 Jul 2018 12:58:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857537; cv=none; d=google.com; s=arc-20160816; b=ShK2ZDASgHKi6GhPC77r605v77GDcPjXzy1DFldFdRbXkZV4MiMeBagepBti7wbq2L Imd0kfIraAOt5rQdGzGm+VmmksYznFZjsnq4yu/1sSq7g6+s8YvJh/pvWhRLh1avJlpQ 8oLhtLWfNc6DTmV4s8TXPJSbtiMnJKLeEHamDEb1lGA2B9QzEK0NIYZRWaZnM4cuHpFm 50tlty0YAV9z2OZ8k6unMRTWKT0S4K07kRW3tY0BfTAZ7PGkZ536N3sAE3bZoNmQMEf/ AyPeA+mPRP+9Blpl/KYwOiEwHqytRtAIqrshoN7DQJaK8sr005uYMGK/AKqVoygPuMd3 Smiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=29+FvpINvVhXvjWGCsM+H4mEKjX2TikV1CFyP9xq/sU=; b=k0ksvMKKdOlZ32EaUSV2L74ukwFArGKDIsiX6gLU74nuzIRwGzf7xYFfmZCxSEpDL4 0D2uGOfnCVXQ25a1oZZ4RHiKDNA5rPxTzka4PgOGcwgbZFx57OO5zusRZh3RmSfSLxL5 NR1sN3yETLkttZS0dMq+/G4gv5IlCIO4NrXvRkIxpLjFk/uW7qGQOJMsNfnfka3XyPfN O+EAj83efJPiSKMUrl/D7Tp0wdGQrT2xJCKH+nzWf3bnuUH6MQxoQvIhhavuXGMJArLM /n9lnylooflcTto8a72DhVQiE0k1gOSHBhjL1pEQKWMLuXSY7g9IGBmMKrIen58LUg4t DgjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NS4d18bQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l35-v6si1636813qvg.30.2018.07.17.12.58.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:58:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NS4d18bQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW7d-0004DO-4M for patch@linaro.org; Tue, 17 Jul 2018 15:58:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4p-00031g-57 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4o-0004di-Ba for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:03 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:42800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4o-0004cs-4k for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:02 -0400 Received: by mail-wr1-x436.google.com with SMTP id e7-v6so2378169wrs.9 for ; Tue, 17 Jul 2018 12:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=29+FvpINvVhXvjWGCsM+H4mEKjX2TikV1CFyP9xq/sU=; b=NS4d18bQ5tdeC69EUsSYPSa4ZvfCGFjV4wrDoGm7kbR/yNUWBMQrI/J0DGs5kTr0xP QRUtP2ZAuXX/ud8mFxaQ5t/INkusP/+NST2w74pbfgbQKHBVzoIC47chTkps3CYlRL4r 6Ixas/f0XA9LOuzRblgzBnuBDn1ZQb9cJ0ApA= 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=29+FvpINvVhXvjWGCsM+H4mEKjX2TikV1CFyP9xq/sU=; b=QZUo7kngcQnyv7XhRnFi/tJjo9r+CJgnT4MYo7wukeysgUftx6fOEFnQQlgPL/X6xT p27pvcjwTsJgLk56CywlqFcfz86vwG2j0ymjRlN7AXXaLSLQIL9oRD81X8QDmFyjbnEz 80hmjYYWnru+F4Me2h4llGQugA7kWgzSGaBtuFAcpi8QPDoGvGOZWM6YLZIw5FkTVP0v 2yv2NRdlPMpryjXyMWeFD1x2qq6KZNFTQcdHa+RbZWIUZRBsE2ZJBeo3Qq13y+GA8NiV ywEsAr7MOyoSi6qumXWjkBPsq9cgogFhPslgqKiZ4pSzUGEH8NsmpjuL+GutKLjl/nus ooPQ== X-Gm-Message-State: AOUpUlG+4na3nMpZXdkXLWCBm/qGTdkvaCxirMSrY7Vv+j11bzlmMwGR OTVIeUYYr6qpHrbN7JzSi7SgWw== X-Received: by 2002:adf:ac2d:: with SMTP id v42-v6mr2382413wrc.142.1531857360994; Tue, 17 Jul 2018 12:56:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y13-v6sm2941415wrg.5.2018.07.17.12.55.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3F9FF3E0600; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:40 +0100 Message-Id: <20180717195553.9111-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PATCH v3 for 3.0 05/18] docker: split configure_qemu from build_qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This allows some tests that just want to configure QEMU's source tree to do so. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/common.rc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 046f8a5921..ba1f942328 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -21,7 +21,7 @@ requires() done } -build_qemu() +configure_qemu() { config_opts="--enable-werror \ ${TARGET_LIST:+--target-list=${TARGET_LIST}} \ @@ -32,6 +32,11 @@ build_qemu() echo $config_opts $QEMU_SRC/configure $config_opts || \ { cat config.log && test_fail "Failed to run 'configure'"; } +} + +build_qemu() +{ + configure_qemu $@ make $MAKEFLAGS } From patchwork Tue Jul 17 19:55:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142208 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4073923ljj; Tue, 17 Jul 2018 13:02:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdhSAXfYXAGKVoPWVwVYpgEOC3YhgHBTV1h31dDGeJOr/7pVHrph7juvd4cc2CLV0jSCC6K X-Received: by 2002:aed:21f3:: with SMTP id m48-v6mr3170520qtc.121.1531857722968; Tue, 17 Jul 2018 13:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857722; cv=none; d=google.com; s=arc-20160816; b=s76UiV9sgzK69EDA86mSJ8Cm6hfNOeAORPrpjH9st+Xz2+BODNkdYZfg3JZjlsAabx ikeEQbHeajkik1d03FqLf+0DjxYFOd65MVPF4CI42ZRk7Nug+f5cgqkB+0EqOmo+otyV 5A+fu4rR3WPAd3MiVMdOpK8GZwbZWQm50ml15bxyeSsLDPlFmbHsmpUGa1sN5OJ6POTc 2P9gClmytHj1M6nUFxfDrqd7tdlL66Z2jaDC4N1B/ztdJKX5dpzXM/ZpNPKxqOLr6qgU EnU+Ft028Q8pGONhHw1E/qYbGQxMF74nLo5YrpdxneCmseM4/f3XdejZoZXR69WsTfrV oP5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=ERLXJ8EDRCZNpbYNqZTOP01060iVj12cBH0Ejozgd/BaWPPKFP6aGx3d2Ga6gd7HWH Zal4pExgR3DmrGJGUa8nCbj9L+x2vIYu0pF1KpOzfKkB3s10slfpAA5hSgPp5mykOWvE DwVgENCMhTT+wUmXl2cSdMSbodCxH69KIIN17gtI/p9m1LPLCea43J4Z8TKjJvXS4AJV xBdREsQr9bY9W9OKRKOAxW1eF9QIClyM/MQxLabbqN3fQaeelFqYZGZKOaysyqag+Xes 6qcOJb/NkYofH4hmls2fP7Lqtgz+cVTeP9aALxR/1bCD2dk41cYuT8nBHdd2uix3c56N aLsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBBC0jlW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l31-v6si2135427qva.232.2018.07.17.13.02.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBBC0jlW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWAb-0007DP-FA for patch@linaro.org; Tue, 17 Jul 2018 16:02:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4o-00031b-7R for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4n-0004cB-5z for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:02 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4m-0004be-Vc for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:01 -0400 Received: by mail-wr1-x441.google.com with SMTP id c13-v6so2397730wrt.1 for ; Tue, 17 Jul 2018 12:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=DBBC0jlWeL18f/XWW4o5aefeFyj1F/HMrSAhGjN70A/rvqxCj2HDRJKDzVDORIWtN2 cbbnOkrUH/0CTy4oGozYU8gP9zze8tR2CJiAhJ7eWHpV/bmQD2x9nORikhKZAnYSMCr0 jVYjTkuOPm5npW5NHJZB2EYeSFyCApzJ/ZBdk= 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=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=qJUKZac7vb7Z0d3pATzhIezSa4ryMHxO1TMN71Wgd5KTKGLltuf4beD88qAwoxZFWn O4MA7Dykv5e8M5eAEvmVQ+i8G7Az10FK32JdHZJpNc/BTx7HuOdXmHF2erk3QGpWIlbA Kp5blWqwe8Bkg+BMT9UEceaaIPfNuHvPVW3Rs1oh6AzdXabEvELJKxxOLDrpmYvHnlVW pN7Z1AY5buC5gr4thyiaZggVlvI+hq3fnI3JxXBvMwsXRVsq68FeI+ZNmyEl96dcnl5O APZCvSWpPjXE8KyrRMOgdMb0TaPtQIKgG4lmf6YIDTq+BQxQkhVkA7T/K1Pa0KKf6Wld 45lQ== X-Gm-Message-State: AOUpUlGndTGoCYvaWTUc4CkO/wz5wjwF4ZrCeuMM0VhF12pO4N9UrPFh 35iQ/qmVPcF/rq5upbD4dXW/ww== X-Received: by 2002:adf:96b2:: with SMTP id u47-v6mr2374531wrb.204.1531857359784; Tue, 17 Jul 2018 12:55:59 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm3247799wrr.10.2018.07.17.12.55.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 56FC83E060C; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:41 +0100 Message-Id: <20180717195553.9111-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v3 for 3.0 06/18] docker: move make check into check_qemu helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Not all docker images can run the check step. Let's move everything into a common helper so we don't need to replicate checks in the future. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - add "move" to Let's everything in commit message v3 - avoid confusion using IVOCATION, add comment --- tests/docker/common.rc | 11 +++++++++++ tests/docker/test-clang | 2 +- tests/docker/test-debug | 2 +- tests/docker/test-full | 2 +- tests/docker/test-quick | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/docker/common.rc b/tests/docker/common.rc index ba1f942328..4ff5974016 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -40,6 +40,17 @@ build_qemu() make $MAKEFLAGS } +check_qemu() +{ + # default to make check unless the caller specifies + if test -z "$@"; then + INVOCATION="check" + else + INVOCATION="$@" + fi + make $MAKEFLAGS $INVOCATION +} + test_fail() { echo "$@" diff --git a/tests/docker/test-clang b/tests/docker/test-clang index e90a793178..324e341cea 100755 --- a/tests/docker/test-clang +++ b/tests/docker/test-clang @@ -23,5 +23,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang" #OPTS="$OPTS --extra-cflags=-fsanitize=undefined \ #--extra-cflags=-fno-sanitize=float-divide-by-zero" build_qemu $OPTS -make $MAKEFLAGS check +check_qemu install_qemu diff --git a/tests/docker/test-debug b/tests/docker/test-debug index d3f9f70d01..137f4f2ddc 100755 --- a/tests/docker/test-debug +++ b/tests/docker/test-debug @@ -22,5 +22,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang" OPTS="--enable-debug --enable-sanitizers $OPTS" build_qemu $OPTS -make $MAKEFLAGS V=1 check +check_qemu check V=1 install_qemu diff --git a/tests/docker/test-full b/tests/docker/test-full index b4e42d25d7..aadc0f00a2 100755 --- a/tests/docker/test-full +++ b/tests/docker/test-full @@ -15,4 +15,4 @@ cd "$BUILD_DIR" -build_qemu && make check $MAKEFLAGS && install_qemu +build_qemu && check_qemu && install_qemu diff --git a/tests/docker/test-quick b/tests/docker/test-quick index 3b7bce6105..eee59c55fb 100755 --- a/tests/docker/test-quick +++ b/tests/docker/test-quick @@ -18,5 +18,5 @@ cd "$BUILD_DIR" DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu -make check $MAKEFLAGS +check_qemu install_qemu From patchwork Tue Jul 17 19:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142214 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4079855ljj; Tue, 17 Jul 2018 13:07:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeZA9tKsyEpTZxwK6zZe9L2U+1Tb+cYF24vTegdZg7RhT8DhtfXJMCMDJ+cVDunXVSqfVhS X-Received: by 2002:a37:2a65:: with SMTP id q98-v6mr2811551qkh.174.1531858079620; Tue, 17 Jul 2018 13:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858079; cv=none; d=google.com; s=arc-20160816; b=I56cf/bar4m53+wY5kEET/u+mWugZhbGHJ78nv/EG7Pc5e850guAL2W/b9ErOcbCRJ o918qehfdgdhBsT1S8Z6AkBkkbG45Z201R/MohqM6M+0nxqpXkhW3zzdRWKAjC4zR2cP 8j8w9quJx1yuYC8JrCl9oqz/VOCMPOriQameNy5ei22GykuV3Tzwyfe15g4zUI3JEMCK AqJSnmxND3i9HzGBAR6vP/2lBYinu7q1xsFQzRDmOP2LilxMUvp9BjWy2Bmw7X3w93gt tMlrJwL/prGfeww/a+xyaS4NSaVySFtZVtbb5Yl7nn6XMLzOcbqoziu2BojkzVE4x8GV P16g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=+2e1Bs5YjRDAe3PB5UShWvIGvDyTiPEr13O3nZ4dD6U=; b=FhKbnaTncWe7UaFbIx20pMRkprbGweR9x5JqO51NSDzx9hAIhliBafo4XyoHVAQJE7 NtZ3/ygbcBDpa9O3m+4+kw4SXLNNm0ruOiJa3IqwO+L2lM+AccNNGtvBI9yUvw3O8wol 9Op6dSv6qq75P6OOD6q/2Rq8r58wV7c9mF91iyj87WRB9Uqtuv/fBMhF5buH+agCjMiA nd3B8oFclRLIpu9sq88VrlXIuhEXB/7ntZiS096PXVxrexbr+peuxI7g4IQklsCsgy7S 036YGJkU0s27nxU6X9N9aIaXMRBDW3AZuVS/YpwYtAlK4HkDCHr+w/n8qzHE6e3pqhP1 cwJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZsU9sW9T; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j16-v6si1216954qvc.65.2018.07.17.13.07.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:07:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZsU9sW9T; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWGM-0003Ve-U1 for patch@linaro.org; Tue, 17 Jul 2018 16:07:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4u-00035i-Fy for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4t-0004kb-FK for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:08 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:39837) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4t-0004jq-74 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:07 -0400 Received: by mail-wm0-x229.google.com with SMTP id h20-v6so535299wmb.4 for ; Tue, 17 Jul 2018 12:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+2e1Bs5YjRDAe3PB5UShWvIGvDyTiPEr13O3nZ4dD6U=; b=ZsU9sW9T1MJuEFuvbFe/q0i5tiTOtfZXfRTQBV4yaJKkM00wlIj2NAnhtl00SIzndh LMZjqmcLNfYVNzQIC4Jc5uHufzR5kjXPXCXFW6gLf7c27MF2m5NEelI6zEH5BcrkaJxl zAh77Fuqq7iyns2XDQKjFsPtv2M0YXY2bClq0= 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=+2e1Bs5YjRDAe3PB5UShWvIGvDyTiPEr13O3nZ4dD6U=; b=UHV/dDU+Rz0cagLbyA+LzltFOrYw8Ar8pMTujoiRBUjx0FRvKsCQ71yvQNNZEiZCCg Yh7LyThnm0IyxUXMEHrWjx7lfAISNb/D4FzLcsGOM7ysZAAe1dSh6eTDBqnRPnFVbVW0 3ZdDsKfRQCmQr4V7KW09jAzSJ5yJ9y2hOCZnPlnYsCjfdsfDP31qUikeF9P367fU45Z0 mvk3UjsrNDLHLOFUg3e32GEzIF1nnBBp6zKmALyFt15tsHsyBO27h1+dezo4zTePdx1M 6SqhkjqfmhhzxM1Q0inBbGoiTCdHXpJefHFqSqUooDhPyDnMMVYf+6Hl1akhDGQQT6oS lNDg== X-Gm-Message-State: AOUpUlFe5bCqb3lmIG7GImKysu55wwXc0WESvJzF6/WmtdXCu7/NMpOl 2s4euG24nNSOZ/7QZk9aMa0Srw== X-Received: by 2002:a1c:13ca:: with SMTP id 193-v6mr2113265wmt.127.1531857366006; Tue, 17 Jul 2018 12:56:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w204-v6sm395948wmw.17.2018.07.17.12.55.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 69FDA3E06DE; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:42 +0100 Message-Id: <20180717195553.9111-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PATCH v3 for 3.0 07/18] docker: gracefully skip check_qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Not all our images are able to run the tests. Rather than use features we can just check for the existence and run-ability of gtester. If the image has been setup for binfmt_misc it will be able to run anyway. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v3 - use command -v in preference to bash-ist type --- tests/docker/common.rc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 4ff5974016..4011561587 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -48,7 +48,13 @@ check_qemu() else INVOCATION="$@" fi - make $MAKEFLAGS $INVOCATION + + if command -v gtester > /dev/null 2>&1 && \ + gtester --version > /dev/null 2>&1; then + make $MAKEFLAGS $INVOCATION + else + echo "No working gtester, skipping make $INVOCATION" + fi } test_fail() From patchwork Tue Jul 17 19:55:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142204 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4070680ljj; Tue, 17 Jul 2018 12:59:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfWJLE1sYk6LFiru9a3eAMH4C+cljaDlgHj15RSMC96PiMBuqtYBByqSgyQRL70Aa70VY7O X-Received: by 2002:aed:2d63:: with SMTP id h90-v6mr3040895qtd.190.1531857546209; Tue, 17 Jul 2018 12:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857546; cv=none; d=google.com; s=arc-20160816; b=ZEabOHKt1ABaaa+j0h7O1J+9F7ekq1vjtHDv/SJURbZVKv8j/74jAWzwpNSRbBgV4z JQ2baU0n/O3BZ0eCTEzDKn/TgAzFeZSffayN+CASDRxnEIZNicGCfi6qd4H1XS7tnktk GJgmS8KADgRBtKhEeIhpMhXgta6XpM9m82IUQRtMNARbCYSZD4pSNSKF/QDDyf7HCw1p it2/0bHpUOKlc+Snr+IMz8QJ+ZhX7q0xR/huHyXIOz2sT6PPAoD2SoG6iQVklEkviHgi diIM5gGrTguiGbWBwXF5Isn6CmJfQjVBk7cHg3ww8RTpNROZ6F/l6i069G4ZlLhq+BP5 Eemw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=k27avk1/gQ2kvKafEubU9TCMsZxFnARuinPZebd6sYo8AguwLBTH9tHAClvHUC6K9Z hDGowMHxlXLZ2LyqBIXIG/44wqYB6kjYUfzqZ9CbXP36LQPanOQdheKXR+kzhBohQwqX H+YigY2p1IPqjDb6+C2ce/0EfNqAHZH+wOxW2YtvoezNxWSKqHQBe0pw/PDjlNl4dIWK tPBh125rzBE5ncy5wAfnegmRPB+x9D+ptbU198Z0hBpNJWw1E7AQAjebbldmn0gtWxQ2 aRDEmlrzpYnR1iUX7uEqcruSIskzJjo1onkBHWvuAcbIMB5Di3PLkIqKYlXXEb/E485g lSpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MAAEuxTo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r1-v6si2171103qvk.34.2018.07.17.12.59.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:59:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MAAEuxTo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW7l-0004HR-H8 for patch@linaro.org; Tue, 17 Jul 2018 15:59:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4t-00035G-9W for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4s-0004jX-Ce for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:07 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41021) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4s-0004in-4q for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:06 -0400 Received: by mail-wr1-x42e.google.com with SMTP id j5-v6so2374598wrr.8 for ; Tue, 17 Jul 2018 12:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=MAAEuxToWtzSkZ48mEc4b62c2P+MnE2nPEoecRIoUvZujBi0enD+Rv5JZczMDGBGka 4heCnIN7Xu2WYM18CdTJGUd5iPiar5RKTnD/nuLRN/0iuzY1sEvaJXJoDFgrA1Zu/dXi j9YX4N+lyMjtjAWpBm1TiDC9r9KFbrVxgVme8= 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=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=La8K8VEAu9zUuaB+RUEaIgVvXwX7NbVXAx7+nF7xylT9exJEavH5x8ylJyz3XYL0QF eHWqTD0i4wemI6kBljiqwZHGs0yq8ftOWuoU6lHhW+S861OkFd7EjlHWQcpgzBbPBsdb dsK/IcO26eZMy/m5IpjXZCyQUpaFYNSy+Jo3vH06EGNxkQ9McFFDyAGbnvwQSOKCYtc8 URxbEfhsy6UOg5TqxPMB2eO9Cpr/I7jLow3sGZ/Mk1nVFi22KFn04oIYYLy3DW9nzlyq Eq2Iz7EywLkHsmUdh3LCM/ILxbP4MOeSWK/HbBIgpNpkWUVDXWzwVzHN8Wl3pgB7vqv0 iw1Q== X-Gm-Message-State: AOUpUlF82HwMk7iOOeLlzl0g/8vHNiU3pMf8294bOvi7iaTOv1Fzf0KI jy2kfcMniGnTW6e7EuTk7HYsgQ== X-Received: by 2002:adf:ac2d:: with SMTP id v42-v6mr2382535wrc.142.1531857364867; Tue, 17 Jul 2018 12:56:04 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l10-v6sm4059248wrv.23.2018.07.17.12.55.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7C6253E06E0; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:43 +0100 Message-Id: <20180717195553.9111-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v3 for 3.0 08/18] docker: Makefile.include don't include partial images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the incomplete cross compiler images that can build tests but can't build QEMU itself. We also add debian, debian-bootstrap and the tricode images to the list. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b2a7e761cc..09fb7db7fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# These images may be good enough for building tests but not for test builds +DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross + # Rules for building linux-user powered images # # These are slower than using native cross compiler setups but can @@ -137,7 +142,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Tue Jul 17 19:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142209 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4074664ljj; Tue, 17 Jul 2018 13:02:40 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfxlszeB0/Q8ITAaDDA0FTLYBNnETmzk8UJoQkHc/P/057Mb3w819ekDn44FG1MRJh5T5/T X-Received: by 2002:a0c:86f3:: with SMTP id 48-v6mr3384564qvg.165.1531857760746; Tue, 17 Jul 2018 13:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857760; cv=none; d=google.com; s=arc-20160816; b=mLCdFT0k598TdirHSZ8e7i4OxQv3jTaqBWO9HrFKYiLGehqO6L+fGMR2+B3YKUjz1e sgrtWmocGIi2WhkcDhBIfmw/XhGQ+k6VIWL2Y5HOWiWcjf7r7dzN0JPfRP3R9EySCXYq iJLDtUEU/PWfhXXz08CbIUMgdqR7owToRk3XAM9oau01wv5vYpydv83PdoeiGea7BFqj 6vWGJqXOxU5o/OlwqVe/pSVVB9cpAqlGzzZqkdxbb/KHRbdgGJnOmtdw4HQPmEv+gmin RY3p8VVjnk8CjyDTgF3FcZDgzu0mbv6Meocij0dxCK8HntbE/j0RMZwNA55QJ0yBsGeL JrEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=fVqeXhM61TiuO/vZ73b3s7Nu/fdrSV2cD3YqcWkiRgQ=; b=eop21tmQkktbG7uVCNPrdAEIixkyTJT2aq1n4yVPPcHDcgcfNvkity0OLy/QM3dkSF LbDs8nDFMh5Nj+0eHXT9STpLLlWO+JUjtsnzy0rsTEbeWZGMOjYuYmmGXVji4KiFMixi Uls9r1cnPWXPRFNNr7xAPhJpcBLJmOfg7YbWKCbvN47Zj1zFmfVeyCUiRyMGOwCIjmDZ 0icWOvSBH12vVBM2vHuGSlqCcxdEcvHTaGjcg9zbjAh/8lR8h361OdSYrX5kEo708RGR x++oK6chSWCiuD6NVWKIFMn03CFqoPmCPv4nRSBcYG56bvkuRgehHaqKCSAHHSE02nj8 aR6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ryqyokb2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h8-v6si1598425qtn.23.2018.07.17.13.02.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:02:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ryqyokb2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBD-0008Rt-Rc for patch@linaro.org; Tue, 17 Jul 2018 16:02:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4z-00039p-94 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4v-0004mR-Fn for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:13 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4v-0004lb-8X for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:09 -0400 Received: by mail-wr1-x443.google.com with SMTP id j5-v6so2374720wrr.8 for ; Tue, 17 Jul 2018 12:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVqeXhM61TiuO/vZ73b3s7Nu/fdrSV2cD3YqcWkiRgQ=; b=Ryqyokb2MWStzY5fkuDbW24bEHOdqCrHb4CKzEbKLXvtYKXfYYSSqh3Nb/GKetpIkm y9Wo8OY5/1rLEAfEUTs1rzz4Bt98ge9wzgnZyvqyT/JLzTstOGih3QEy3hYuosmxEYKV luBiM2++EjJlSgUDuljSTcVUDPVihFa30tGwY= 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=fVqeXhM61TiuO/vZ73b3s7Nu/fdrSV2cD3YqcWkiRgQ=; b=MdPJys/d5glzaM5M/MkS3UYIIvVYnNtF7Q4OK3VCpukMJ6+SP7/yU6zwYLI+1rm85I z6N7bKoNPi5iRbdSJF7xnKiba4eQ1rwfyJEMdk/0jUcWpX/MdTF1NyEcrhWcyn8Hgsou svZZbUaUbmqxUt9Qe9Hgh0oOntjt+m+ChZyWCj8xECk2S3n9hKt6p2yreUxJGc39L7Dp qe6wkLXb8dOSR18D9YuIkVGK3qLkwQKTqEf8IJgkCpM/X9o7s/HlIEunz4vXqaQEUrS3 bmt8bk35w5vm2RZJwJmAZv3QjcVavjSK6bAv1SnEFd53381exhtpY6uk8pKwe85UhMxR Rviw== X-Gm-Message-State: AOUpUlHpGH83BQqpsruG4unS0DT09lk2zH8IUm3tIR7DjJOZeh31OyfR 2YdAtLE9aR48qyC16NxzISJOOQ== X-Received: by 2002:adf:9d1c:: with SMTP id k28-v6mr2442025wre.29.1531857368153; Tue, 17 Jul 2018 12:56:08 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u4-v6sm3349942wrt.31.2018.07.17.12.55.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8F08B3E06EA; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:44 +0100 Message-Id: <20180717195553.9111-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v3 for 3.0 09/18] docker: disable debian-powerpc-user-cross X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While we can build we can't run the unit tests due to a missing system call (249 - swapcontext). This could be a code generation issue as other architectures don't seem to have this system call. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Cc: David Gibson Cc: Alexander Graf Cc: qemu-ppc@nongnu.org --- tests/docker/Makefile.include | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 09fb7db7fa..fe63aacf69 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -140,6 +140,9 @@ docker-binfmt-image-debian-powerpc-user: QEMU_TARGET = ppc-linux-user docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user +# Unfortunalty while we can build with this image we can't run unit +# tests due to missing system call: 249 which causes an abort +DOCKER_PARTIAL_IMAGES += debian-powerpc-user-cross # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ From patchwork Tue Jul 17 19:55:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142206 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4071007ljj; Tue, 17 Jul 2018 12:59:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpckIN+fePGpJJIKx7A09cFllvBAHuMCDgItDI2f+GODgw7PlFqmEx25djZG631IXomaqVNr X-Received: by 2002:ac8:1bdd:: with SMTP id m29-v6mr3033004qtk.318.1531857574361; Tue, 17 Jul 2018 12:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857574; cv=none; d=google.com; s=arc-20160816; b=shOd28oZqWkvqhfuf8xNxDMwIKp6pPvW/g4ZSC2Xp2sXO+PNtQsyves7WzojZNQYj4 unD8N0fSzBMzEMgl/INoapAL7XubPnOT0NLaFkIOsV4wUxMuHh/LGrO7QfVWYm3FqCbd IYrP+KC16wBDNgH0iKwQzzLctcvw3rWfYQi+eNgw4GM6w2aea4Qi3GpM3dWBHlUZ9K9C b8nE1qg2Q/X9twniOvjQv3UErnQQ2qPcIfRTojNjTBrPeJ5wmMN8ABO6gwve/Em0cg9R a/okWpmCTepTg+VEp7YsIBqD2pyShwnW8xLjGPhwrvTa7HIzYpkvwjceXVr/IrTXkuGE ZEXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=q0tIQwCUMfDfDvaDmnBY9FLc57UmCoUBHB+PkCRBiOo=; b=t0333J1DJ9g/O7o5AdF52R4OLPxkeKoHOReu3NELXtfYiMR5ghR5O1V46JZ9sLVjws imJWeKar7i983whqrgsWABX85C1MwSgazo5NRu2ZYkN+g3SM7ANt7OZWAA4XqpbJvctG BbmrEjTdnNGD/EVHD6WosbQH6JUVB0wT3hDKnTTQ1SP8uEX8lLtbvzLeAYK/D+huCZ6s 8nIEVcbBJBsXWgSBLkjLY4D1xsCMAc9l3bzvMaVIWPM26lvue02+wFCoh6DEg89f4wmd GAuNsWmtpqu5qMzNOuwGxxd1AYY9IWnFnTbrwjICC76AbzVvxSPxKU1NChAkBJpMW3l9 LevA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bWf5H1uq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r25-v6si115213qkh.82.2018.07.17.12.59.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:59:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bWf5H1uq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW8D-0005mY-O8 for patch@linaro.org; Tue, 17 Jul 2018 15:59:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4s-00033u-4v for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4r-0004iT-86 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:06 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35307) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4r-0004hU-1e for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:05 -0400 Received: by mail-wr1-x443.google.com with SMTP id a3-v6so2390104wrt.2 for ; Tue, 17 Jul 2018 12:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q0tIQwCUMfDfDvaDmnBY9FLc57UmCoUBHB+PkCRBiOo=; b=bWf5H1uqZjwLPWqIVBuaNrEx26HttnC6C8imB+M1DFZwCCTE+arARkuFCFHPXRsEir 9UAxENkUbTtPkWx0/iVVt+5dYb8e8gmGMiQjzk+NlcsjF/epMDRKm76qHWfbZRl9rOLa bjVO/wQYl5pkqhQ20P9VEyyBI2RChnKo27RhE= 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=q0tIQwCUMfDfDvaDmnBY9FLc57UmCoUBHB+PkCRBiOo=; b=P2u1RmKNpSUlgk6JNwU+sWaLqJZZhCxnL7QAb04dxJuZpRR5P3HGLSzG56OChTIxvu qMoS9EO4uW60edrS/zKtCkRDwcgVX5+F3ddEB8h8QZP9dAsee3+550mjZxeFbjqbRirI gLUG72n0QopNvkoMT4t2It7IOhwUQRqQluR+CgWXmxNmEMoAvMoKHjFcDawrfRUC/PYp clgrEgGjNiQjK2PMHXt9XfhuKaom6a0TBNLwsBcTqdfulCXfv3c3LdGcvviN9AuYSeRp wJc3iSQCL0Sh5iI0wZ0m8g7ZeVdMYGcez5/ItkG8VMSJ2uEVr0BTlhgUtnGgfggBC9t9 KVHg== X-Gm-Message-State: AOUpUlFaQTHPQa6aSAKry2PIhh5IerNNEt/ziI2oqjrfJABWLGrgN+co EHtRl46InEsjAGax/GfmU9yA5Q== X-Received: by 2002:adf:8385:: with SMTP id 5-v6mr2340448wre.13.1531857363869; Tue, 17 Jul 2018 12:56:03 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t184-v6sm637141wmf.18.2018.07.17.12.55.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A17643E075F; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:45 +0100 Message-Id: <20180717195553.9111-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v3 for 3.0 10/18] docker: add test-unit runner X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This test doesn't even build QEMU, it just builds and runs all the unit tests. Intended to make checking unit tests on all docker images easier. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - make script -e to error out on failure - add comment as to why the configure step is run --- tests/docker/test-unit | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 tests/docker/test-unit -- 2.17.1 diff --git a/tests/docker/test-unit b/tests/docker/test-unit new file mode 100755 index 0000000000..8905d01150 --- /dev/null +++ b/tests/docker/test-unit @@ -0,0 +1,21 @@ +#!/bin/bash -e +# +# Build and run the unit tests +# +# Copyright (c) 2018 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or (at your option) any later version. See the COPYING file in +# the top-level directory. + +. common.rc + +cd "$BUILD_DIR" + +# although we are not building QEMU itself we still need a configured +# build for the unit tests to be built and run +configure_qemu +check_qemu check-unit From patchwork Tue Jul 17 19:55:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142207 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4073895ljj; Tue, 17 Jul 2018 13:02:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcQRV60tJA8HxS24Hjav/YTEbCjUPsFOUp+txxjv7AeTlKfFRtLuSnamE9KQvIKiUGg8NcO X-Received: by 2002:ac8:371c:: with SMTP id o28-v6mr3051451qtb.205.1531857721781; Tue, 17 Jul 2018 13:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857721; cv=none; d=google.com; s=arc-20160816; b=hAIosqnEyGXhtWC8/ELBgPlUpLHjYjRP7MJZUvVYsp+mxPeGOI3L1cEDn4g+BEXwaj uU+2xvGpYBZw11O1AI82WgR3yHO6o+qH93LEleZTCazlm45dC88OWopspvEEstU762KA DMuMUg4wmsXnucTAQcV4wVHuzhP+hxTT2P/3OsGqtqbuuRy/HWJz1X3uReaTE7BeNlT1 ukJz5xrYOkm40lvv0NRUD2zQDz71r44tecluR0lmKEkns3rPvTy3L2sTpz/VYCZ9Ey0N YPsWM00G18vX+QPWlz3DPORVkvcBaP7eNia0YKp3b7rK7vdwflW8kPfUV3UDeYu+J8/r i4CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=3JPvvh5QXlLcGMWUhLyblX++7+0qWrYLLcmiVFowQzA=; b=cXwmH9lAB0FWp1t4UG/FgQrmLd277L/uE80vFP+82qyCvAPotgPtIO6hquMa2tGbjq BZ9y/vKWpY+c7VmaUSQGYqZeYZJMx/D5swteQ9fKUM9dtcd6GG+U1uKwxehh1Fmt+aAp Skny63/ruvtC4uJmjG22QMTrm1ROrekFQkOxnGbtdHPp5heIxp8bPLxh0kMeiIzDyegr 97nQjOU67UpJIrhLAclHtPQ4JJvS+uDOZNRc296LK7+6whfqFkWRYboSMquOYoJGmrS9 G0SM+7TD902Vnf6mKHaj6dFRjUe1QdzdZEWesyGsmB8LlJmpW2KM4TcbubkZUDRdxdBM EEKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QsXirsZZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u17-v6si1584822qke.378.2018.07.17.13.02.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:02:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QsXirsZZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWAb-0007DV-0H for patch@linaro.org; Tue, 17 Jul 2018 16:02:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4r-000335-Ed for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4q-0004hh-K3 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:05 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:51925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4q-0004g4-CT for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:04 -0400 Received: by mail-wm0-x233.google.com with SMTP id h3-v6so128529wmb.1 for ; Tue, 17 Jul 2018 12:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3JPvvh5QXlLcGMWUhLyblX++7+0qWrYLLcmiVFowQzA=; b=QsXirsZZhIyVdEo972cvlPS+zT6nV1b+IYErMDy8QaJWudFr9Xtz0udYFzSdEXewSn HCBr7BWnd2brVRp5dGzNKX8NFetDhqTni83lE+ijRFlOuxkgd07LN7TBaMC+DUl7B20/ d6Ik4fUK3lT2GrM8VILvYfs6CMeu0xtT3pKtY= 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=3JPvvh5QXlLcGMWUhLyblX++7+0qWrYLLcmiVFowQzA=; b=VgPTFOgWPpamgB1EPeZVv0JFDOE5+mwI2SryZvymYZjBRlcXO/3/XDV0fywRDzWC+K Ez32zVj4YRNSnbRh1zk9E0iS8brwHXF2Oo+LuFL/pgRj+8eRZxBs8XvmLAlLq5/Fs6HN IFOPrWUKycad+33OYTK8+XGwYgwJKEpruDV0Sr2todWS5DvJllO9mVjLT1BjWxL1BiOw rygZdhbLJeKHFz33PPKK2OCd2PtCvnq0JqDJgL1JvYFTinAWomGfizIxlxQtH/nqZUC8 nWC+wOJovq4mQ59JI/gOed0PlNjV0B2RHg1RYEZkDn4GefuyIeQU7XJbdJe0blUa0ibe sPlg== X-Gm-Message-State: AOUpUlEjUJ475TJGIVbcc+Niq7NDz43FKdIK72DhI9MG4yRfOM0VsWIR 67ZiAW4FEAHOGFmWWDcL4IeTgg== X-Received: by 2002:a1c:ac44:: with SMTP id v65-v6mr2093447wme.25.1531857363098; Tue, 17 Jul 2018 12:56:03 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f18-v6sm2476019wrt.64.2018.07.17.12.55.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B4BB13E0BBB; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:46 +0100 Message-Id: <20180717195553.9111-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PATCH v3 for 3.0 11/18] docker: add expansion for docker-test-FOO to Makefile.include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This allows us to run a particular test on all docker images. For example: make docker-test-unit Will run the unit tests on every supported image. At the same time rename docker-test to docker-all-tests to be clearer. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - docker-test -> docker-all-tests --- tests/docker/Makefile.include | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fe63aacf69..e32c35be0d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -151,7 +151,8 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ - $(eval docker-test: docker-$t@$i) \ + $(eval docker-all-tests: docker-$t@$i) \ + $(eval docker-$t: docker-$t@$i) \ ) \ ) @@ -161,7 +162,8 @@ docker: @echo 'Available targets:' @echo @echo ' docker: Print this help.' - @echo ' docker-test: Run all image/test combinations.' + @echo ' docker-all-tests: Run all image/test combinations.' + @echo ' docker-TEST: Run TEST on all image combinations.' @echo ' docker-clean: Kill and remove residual docker testing containers.' @echo ' docker-TEST@IMAGE: Run "TEST" in container "IMAGE".' @echo ' Note: "TEST" is one of the listed test name,' From patchwork Tue Jul 17 19:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142215 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4080335ljj; Tue, 17 Jul 2018 13:08:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc9VW77YOsIQNTwXR+VZnkIedo1/+YOXdZALiIbqVPPrLwTFgXSSXjuBWixa8TGjsBm4cT9 X-Received: by 2002:a37:9306:: with SMTP id v6-v6mr2856070qkd.36.1531858109482; Tue, 17 Jul 2018 13:08:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858109; cv=none; d=google.com; s=arc-20160816; b=N7Y7Nzp2DbgGv341WiEhGy1RhT35ogwiNTgLkD4mWR9Zxlfbjx/9D7yv8aAwKD5Q6a G01wzwr93/V1S6QRnEfqv0BDGmDjfKJ+VPT5DrV2qmp1Za5hzjEUUUnfUS84aVWuRlxe knfcGNvVeWh7JqVuUPblpEAXG/w7GScirUCGtFTcc4YmlDOs7T/KDOVS2su+ERCJzNdq qLXTAH2dIS8qPc1LFN6ik+V9z+K8xbGS8vwbDeYAIthuZ/Aj3JDdxxBabc0S+kU92Oay P4i2NfyD8EOsjO4pVcKBs/NStY33hL6osRc9yt8sYbXvZAary9euckLoKbCJPQKCQK0d xITg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=v1Drv7kfTfIpoZyJGSFxXeSenSg72yPgpmu7+GxMn5jlYD02oqZlI6K/1UR0SQteqc QjO6Td983e3tiZwSdKsZxjst27U1ipVAkW7j6hIOilHqteO50lib2zwXLMyVm8CEYSFt MfHJIIusqbijNBwkelWQ8coplCCCmE0jPZ0tL6YiaA26MvxcdubEYRVntASNAs+lnzuC Kv6Y3lEuEmgaoPlzF4pTIxlLy3Cyp/shecN6O5ncciK0oW/GjuXl1dphlybPJ/JKvAau d5/ojYwdZGs44dEFE5Wigy3AqKw72bjv61ktSDsxQ38No67RbZw+NZdqI/24WbSNqGJo kJyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZGfr5WDf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x67-v6si1631827qka.168.2018.07.17.13.08.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:08:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZGfr5WDf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWGq-0004H2-RX for patch@linaro.org; Tue, 17 Jul 2018 16:08:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4z-00039h-4J for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4u-0004lN-FZ for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:13 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4u-0004kl-8u for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:08 -0400 Received: by mail-wm0-x243.google.com with SMTP id z6-v6so13357279wma.0 for ; Tue, 17 Jul 2018 12:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=ZGfr5WDfkp2buIlchgcKNoOELwiv4w3Ja6BJxsU70urkLUcQ2DVfHVgKNh2w0JnI7x DYxMxO6xBF7tMponmDWTMyJyZ5+8iCljT4jOq9E1Vz63KxxxOlUWuoiIgIpv88IqyA5X 0B8p/EPGVT3eXWIZgct81D35Vmmi72V2LjxhA= 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=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=sz7z0JB7Ws41I69HVdTXVx+0crhYnzh6lPcC28WaBUi9rstXQOTzW/BN8mcHgTlNM6 cFbReuHzxTp0DS5p6PKiNkEAxNd6dMMH635dwws5wJ/mSaiB6khR/g6LVzPXOjt+6Izh G/HeCcGE5qOk5PM8ylmzU+AHlt59Gfri8wZM98Z4JilWrHQO2CajBl0urvtyb/T7CVjf 6OvEbdf45Vss5tB0SXtd6aWAwB/wqkoFcdla9X9CSnDa0lOoYkF3Hy9W6mSFJhvfYUh+ tHKpbjbBHsuoRYt/ttLrhcFrTpRdAP7XGgyjJm++pCO5MYhablF18MOH9murJC+veHco egBA== X-Gm-Message-State: AOUpUlGXRYM1fW2wE26+Y1czKrp4z4wAh8lzlxUzKxKCapiDWzjMtiVb n7paDkq56MdIqzd/UTL724gjvw== X-Received: by 2002:a1c:aa8f:: with SMTP id t137-v6mr2130694wme.54.1531857367058; Tue, 17 Jul 2018 12:56:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7-v6sm3811853wrm.14.2018.07.17.12.55.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C787A3E0BBD; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:47 +0100 Message-Id: <20180717195553.9111-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH v3 for 3.0 12/18] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The addition of QEMU_TARGET was intended to ensure we fall back to checking for the existence of an image if the build system was not currently configured to build it. However this breaks the direct use of the rule for building custom binfmt_misc images. We already check for EXECUTABLE so let us just use that as a proxy for deciding if we are just going to check the image exits. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e32c35be0d..ec23620153 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -58,13 +58,11 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),,\ $(error EXECUTABLE not set, debootstrap of debian-$* would fail)) - $(if $(wildcard $(EXECUTABLE)),,\ - $(error Please build $(EXECUTABLE) first)) $(if $(DEB_ARCH),,\ $(error DEB_ARCH not set, debootstrap of debian-$* would fail)) $(if $(DEB_TYPE),,\ $(error DEB_TYPE not set, debootstrap of debian-$* would fail)) - $(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)), \ + $(if $(wildcard $(EXECUTABLE)), \ $(call quiet-command, \ DEB_ARCH=$(DEB_ARCH) \ DEB_TYPE=$(DEB_TYPE) \ @@ -136,7 +134,6 @@ DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-c # broken so we need a qemu-linux-user for this target docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie -docker-binfmt-image-debian-powerpc-user: QEMU_TARGET = ppc-linux-user docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user From patchwork Tue Jul 17 19:55:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142220 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6282ljj; Tue, 17 Jul 2018 13:19:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfeijOZjkB9N9bF3aHiXn2Q1eyXySSPQv+4esktchg7IQGMXCm2/lwGTjgm10I8gyopoV5o X-Received: by 2002:a37:32cb:: with SMTP id y194-v6mr2834167qky.11.1531858790761; Tue, 17 Jul 2018 13:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858790; cv=none; d=google.com; s=arc-20160816; b=bfQKiogf/7EcpFud4AZy1x82T60AA3OrkaLRyJzQ6xi8IX791qWs1LzdHFHl4yG263 3EPMJVZgxr8D/LJrIB8zcbZCfZF+FRJssTrskl7DTdOvaAYBbDYj8Dgpf8QTtLoEzrTM dT+I2ORaVqaBKu+QNCWu4PcxTfgBTxizVLlX4bRHm3NTko52Itg7QN8eZqCOX3aXZYfR TEnTDAuH1IzkfTO/t2mCG1IQcBomqNKRDAWjsKMRyEiQd/37dp/dtLcKUltq8l7DFAt4 KT9A/RFuWSYIwhtWkH9WV8pQ++5/6ednFT3GNElNLdIOjsA1Q0pMzUJBIcDxZNI1bq0z 6xjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=o7r3f4+YZFONyR9NdeLLG2BycbhTlCsfz1D8nGa0mlD9q9VIM2qaZunDOkDJI0BIgO FKhlco16HvdH8D7W/NzToIoLofsSn3OXVfDgreiYfnABHZixrCjO5GvfxABTPQ4jSCM4 NAwDzZ5th3es6e6hdzoEsYuOmqV62riIzAaTQZyMVERdK5uPorEHNgxFTytlJWlvuYPr H7IlojaukyJH0R/OZMAB/O9kkh8qM7vq6EZb9hpEkHg2ZMpjEQ5DbYly+OqcrovRaitn zP+SopJwdPd6WZnBMukxu6UfVpsrBTBmMFrAciV67mBg7cDlBb4cQGhyDdW/YO8TB40/ AfCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DAGjvORw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p84-v6si1134439qkp.268.2018.07.17.13.19.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:19:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DAGjvORw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWRq-0002Qp-56 for patch@linaro.org; Tue, 17 Jul 2018 16:19:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBY-0000cm-6R for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBX-0001je-9O for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:00 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:37082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBX-0001j1-23 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: by mail-wm0-x235.google.com with SMTP id a19-v6so566036wmb.2 for ; Tue, 17 Jul 2018 13:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=DAGjvORwaddBCYIeH5hOiBtm75uCUhgCA3zb4r1WBKpbK2jPvATyEmzZ6aDY2asabF kA2Gd7UZ4TtRH8bRVZeLhHm1zLkt4CYESSHfr7kN9o55oVhaeUMpSw9vcQsjnAyUZ9KQ sjW4c4wOLMyZFkOGIcwvSSdtkY2gYw3V8brrw= 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=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=HvxsXE4v2rqS8MBoZSfACf/bLq14mdVOQdcU7tIVv11hFcaKA9id4/46NE2xMd07hW GYPQFgi2dI4IIPwlc+bG5eFu3eZSMBqPcNiCn+kejLKjG9sWoH/lbUxVKCJDqX9V1osy NxGKmQ0wX+p2DCvNqn+GwCWo2phLrPavT6v/Sw49vw/U17a3FGpMEglNhgU+w7Gp6nsD J7zUePH8CdXWYrRF+iyPgAluR8dtBZEhhh5zQF5XFZCvVwSQhjDUavdLrA4Oqu2nw++l QWkuYJlfDLK+7R47B3ja3mZ3wO8+/5WnCLZQA44a4/9r9HSxSCHN85Gqa5Z8fBnc4hr/ 33lQ== X-Gm-Message-State: AOUpUlFiRpUfuH4fUqwbvaEWdSYPKfC+yXDRbZZwyPz7fh2gnxOJB6rX mhVCCQPmsCOjSHTtHvwc93U1pA== X-Received: by 2002:a1c:70b:: with SMTP id 11-v6mr2189078wmh.151.1531857777876; Tue, 17 Jul 2018 13:02:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 185-v6sm767082wmw.23.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DBC233E0C98; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:48 +0100 Message-Id: <20180717195553.9111-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH v3 for 3.0 13/18] docker: add --hint to docker.py check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When a check fails we currently just report why we failed. This is not totally helpful to people who want to boot-strap a new image. Add a --hint option which we can pass down to give a bit more information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ec23620153..c9e412f9d0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -73,7 +73,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< \ + --hint "you will need to build $(EXECUTABLE)", \ "CHECK", "debian-$* exists")) endif diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 2f81c6b13b..523f4b95a2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -475,6 +475,7 @@ class CheckCommand(SubCommand): default="checksum", help="check type") parser.add_argument("--olderthan", default=60, type=int, help="number of minutes") + parser.add_argument("--hint", default="", help="hint to user") def run(self, args, argv): tag = args.tag @@ -487,7 +488,7 @@ class CheckCommand(SubCommand): info = dkr.inspect_tag(tag) if info is None: - print("Image does not exist") + print("Image does not exist %s" % (args.hint)) return 1 if args.checktype == "checksum": From patchwork Tue Jul 17 19:55:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142219 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4220ljj; Tue, 17 Jul 2018 13:17:23 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfc6HcC8WKfhrzJ0IbVECqfdEdvyBEAvkF2l/RNJf1IzvyLXU9foAg7BQJC2YYkXgfv/a3h X-Received: by 2002:a37:8643:: with SMTP id i64-v6mr3028506qkd.194.1531858643419; Tue, 17 Jul 2018 13:17:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858643; cv=none; d=google.com; s=arc-20160816; b=LJ57SoLgVNTsV7ekzk5E181U9/sGYvHSoseqrvag7J8Dsod3hc+cMBcK4y7aL84Q3X W7ByTIFHFlAy4LQ0Bh2cGBcL673VatgNaSw3VRYlm7z9PigfBcbx6WJPHsYIceV8Fa17 Znju1U6lrN3QScT83u8+NNeZoRm6nY0Y2Y2eQjBEceeOqDzcVW6coTt1/DEbhIy/SmFL d6e6IEtoyzYpZ9097ygNFKHq6S1fCc1Bs/Nic7bT9OqvEQ2SZamje0GHpnh5Ms443Cpb JF8GhNcLyPH2TGiZCFfYM5qXK5mdpHkgmgI/vQNBIgUPUuwjJ8+t+ISZW0AJBpPVn/da B7SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=1MKzdoK/MCfbGVwnw3ruXmQEW5dlGctPyFI28rtTlgU=; b=pL6Uv9r/YjTh6P0gCpdYSN/9Ru/ozySirWYbZPsZqnc8BKqOpPQMB3awMQNx8zC1DV VmfhrabeFvwGvtI0U6YL6O5CTOiYMWMRoVU7gOYcjCuTtONPh0IZk8wiSZMUGLLfYoRw mRMu866rjbYdGXLFxcEm+ThLFfDX4TQK1s7nBnroWNkM+qWsYcZSizSgwY+NZ/ePxlJE KVBYfyIUOEQssV5O2rJgD1r6cSq7wEKZx4k70hu7/TAc4QN/yZzuWlxZsWBcLRJI1Tn6 Q2EoYZp04T2Y9brYauop3pjF3Lx2tHoGCrSJ4PpQZoODvhSh0aoxqzCgDal0S061v8tP L7zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TDursS3z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r41-v6si606156qtj.307.2018.07.17.13.17.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:17:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TDursS3z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWPS-0001Qz-RG for patch@linaro.org; Tue, 17 Jul 2018 16:17:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBX-0000cQ-RD for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBW-0001iq-79 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:37378) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBV-0001iN-Vl for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:58 -0400 Received: by mail-wm0-x244.google.com with SMTP id a19-v6so565997wmb.2 for ; Tue, 17 Jul 2018 13:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1MKzdoK/MCfbGVwnw3ruXmQEW5dlGctPyFI28rtTlgU=; b=TDursS3zTBWpzoN3Cysie5CRYyNV5tYrYm7SIS1t9rjrHkqBVROD6GYjgd8OPcvMMq wjPjTXgxlFtUA7qT5UQ6c/juS/470Gw/pJTosn0jgA9yRUntwZrI8FgC6KZhqxNl+aDg tCBqRlQbiDhplODrngbw2y7gmXO5LZjReiNaI= 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=1MKzdoK/MCfbGVwnw3ruXmQEW5dlGctPyFI28rtTlgU=; b=lkbGP9upt82802E2Ogx52B+nle3i6wT80X9KD/APbgHb8GCHNYc05PVaNsvn5rqc3l ahoHqxZV2Lww+ppFLSsSHWn4XqIprTva9JHTtnINzSpZnd6I5J14QN9N2eTV3BjPno1x 5+CbMBkQojuSbMBnW50sZEgDXVaHBGsyvKoEIgW/ruedSpmj/CRqSoMhaSbAcYt8wqZD 0QiupJeKeEO7iucyDiTMAacwyNU4T0thx0G5fE/vzxW+7gPTbiTN14bMxi2/p4DQdfaT X5vVyK5WEq4p+Tks1lXlCUfe0o1owVBEm6dR+DQlSZZXnvG5j3fAOCHLXQg0KiFnTgr3 3C5w== X-Gm-Message-State: AOUpUlGnG5j1M9s6zjhHdw/tqbzj5U+f3FlS7v6uCQK3pWsMKVdw/82a HUzIBGosW6YT3Tm7GW++LDIOlQ== X-Received: by 2002:a1c:3743:: with SMTP id e64-v6mr2181984wma.63.1531857776804; Tue, 17 Jul 2018 13:02:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y102-v6sm859523wmh.9.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EE4C43E0D14; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:49 +0100 Message-Id: <20180717195553.9111-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH v3 for 3.0 14/18] docker: Update debootstrap script after Debian migration from Alioth to Salsa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This silents the following warning: Cloning into './debootstrap.git'... warning: redirecting to https://salsa.debian.org/installer-team/debootstrap.git/ See https://lists.debian.org/debian-devel-announce/2018/01/msg00004.html Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-bootstrap.pre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 56e1aa7a21..ea324d6e4a 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -62,7 +62,7 @@ if [ -z $DEBOOTSTRAP_DIR ]; then NEED_DEBOOTSTRAP=true fi if $NEED_DEBOOTSTRAP; then - DEBOOTSTRAP_SOURCE=https://anonscm.debian.org/git/d-i/debootstrap.git + DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git export DEBOOTSTRAP_DIR=./debootstrap.git DEBOOTSTRAP=./debootstrap.git/debootstrap From patchwork Tue Jul 17 19:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142217 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1167ljj; Tue, 17 Jul 2018 13:13:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcIqSrLqsOK906gDA8elbk9IH0MHVEDzOHBGEWrI54zvpbSWyN48+R7JNuWDemLYFlo/pEo X-Received: by 2002:a37:338f:: with SMTP id z137-v6mr2886042qkz.172.1531858426038; Tue, 17 Jul 2018 13:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858426; cv=none; d=google.com; s=arc-20160816; b=SdGwqPUpNttjRBF14W+QEbOqn0PAOkPdBMF8BLbPDS9mbZojaEo9CqnD4qsNsQ30qH CnDfLsV2dzX2JBYz3ht7JN+WGnhyGDC1ram2KRaQBfT3EqEfF2FYG9nsmz5KcySosriJ YmVOOjChcwMbKnCEA1ueyr28o9KhsanpzvCInSyjf4SsJj3sG2HSLelRX3fLyGf1XlAw vT9a1oZuSeINNciBr3j9uA60ZeMMKdVd8pNa1S1mPoYr5/iu14ofhGNbQSfTZ/VMwrji ZSYuxMDAvXSAzRtMRcd9RLV3nLuW6jI/wMMl5G/hY7m2LadRZ6camb+xUdFOacaTFzE4 pGxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=eIYkuGTVdjdwem9K1ywphqkgoaT/KOiP/rzEZOwMXN0=; b=UxTwv/RvEG5KfCmVnJ4Q7bs3yRQuETzMJP/Dr8T/mP4QkxnbNdmOq6PsYw+7dXMTEm lgkeKswBNG6TWz6zMZkaNXy8wicA0QadfZnzG70qmz9v2tz7ea7TrjwP28UsMjc++KsS 0u+O1B0PzeuVGoI0ZM6cvon4adtGg4HkNnGPE08C/mF2ivrwynEGWZDNae4DtISp85w7 1U73WxVlIqCSBc5NmeSVA1oskoI0OSzv1a2pZEE+JtNhswX83J+ynuKU84na7uDNAQNG RlIszA2aJCM4hLefTC7IuJvOfaTMpZc4iwiHn03hGF30JIUSBJAI2eXh5KBK3xYzNWgB Tm3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OUJDlWvL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d63-v6si2101567qva.170.2018.07.17.13.13.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OUJDlWvL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWLx-0007gA-Fr for patch@linaro.org; Tue, 17 Jul 2018 16:13:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBX-0000cU-SE for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBU-0001i9-RB for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43423) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBU-0001h9-Jy for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:56 -0400 Received: by mail-wr1-x443.google.com with SMTP id b15-v6so2385919wrv.10 for ; Tue, 17 Jul 2018 13:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eIYkuGTVdjdwem9K1ywphqkgoaT/KOiP/rzEZOwMXN0=; b=OUJDlWvLdMcGmeEs2vacff/NYY/TmkmububPD3K4/pw3egovOZDUmjfw5zO26La+Ya Fa886GkTJyQlp7nzuZ6SxIzhqQQ1p7PAiUIDidNTf5dfPM628uPa9VL/qgFJ1H6NyjuA yObg3G8umfAC2nTa93uqZghZHIt61We49x/sk= 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=eIYkuGTVdjdwem9K1ywphqkgoaT/KOiP/rzEZOwMXN0=; b=ralef2kSKH8aiYSMwGyd/HPaw08bRcZ0DwfV80bDGLKz+PDPsL8XmeCDtKmArmcrF9 Go2x1aSylv+ET8nPKwTwZnKomj9pRm4g2b33S1DXLzN4c1F5l++igr6eVYS4yBeTtsl2 iF1GqMf8U97+W85crUanYXHkxnqrdV4YnoqEIITpAoNp9ywuLBUgzGOiDo9E2lEXHz2I 5FWvFQ1+bXfz9jjEIJpt1p4S0762SOzyGP6HybT6vjF9VjXbGtD+wc8rR1gkFeI+TodQ QqqoJFA+c8MMd2C4VNkoOo9/P3T69Z2sKNQk3d2EeWcv6BmFtRFsw2YTK6Sft+Eh1T7c Y0CA== X-Gm-Message-State: AOUpUlFcgf9mmKh0LJvx5i8fdO7GijfC1+56KJJM+LTAwlEDqHTBQFyy D2rmdGqQYLuLIkmNrPZftmeCHQ== X-Received: by 2002:a5d:44c6:: with SMTP id z6-v6mr2351895wrr.236.1531857775497; Tue, 17 Jul 2018 13:02:55 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 189-v6sm718020wmd.17.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0C6F53E0D4B; Tue, 17 Jul 2018 20:55:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:50 +0100 Message-Id: <20180717195553.9111-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v3 for 3.0 15/18] docker: add commentary to debian-bootstrap.docker X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is just a note that later versions of debootstrap don't technically need this hack. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/debian-bootstrap.docker | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker index 14212b9cf4..e13c26a7ed 100644 --- a/tests/docker/dockerfiles/debian-bootstrap.docker +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -9,6 +9,7 @@ FROM scratch ADD . / # Patch all mounts as docker already has stuff set up +# (this is not needed for later debootstraps but is harmless atm) RUN sed -i 's/in_target mount/echo not for docker in_target mount/g' /debootstrap/functions # Run stage 2 From patchwork Tue Jul 17 19:55:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142218 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4012ljj; Tue, 17 Jul 2018 13:17:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfw8dsKnKa14ievdPy+MqxX1q5rzSpPuPFBsjDYiDvOSsMDquAl9X1OfUAfAP7Kc4Enrv5N X-Received: by 2002:ac8:5343:: with SMTP id d3-v6mr3103055qto.141.1531858627361; Tue, 17 Jul 2018 13:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858627; cv=none; d=google.com; s=arc-20160816; b=rWhNP83DJccZZStcTj01sLSMKq3h9e9PaYvTsCkj5XbmRmoADffesLr5kiK05h+V6R fX1wCzSHc83OyBGDsCFUQnUbC61Y4kWPeq88cMM2D0HgB8bEPAsx1aNE88oFe4ZtvzkR E1VvHNGfVjuHcTAqPY+Ft2o3VwzS6eOcyZjnNGua0IUDaTzAtOZrqxfdmEaRHtQnPIEr JsWG4l3tIJul9htZ0xZUyzCzeulV603a0jEgZBJvTEKv4vvhla2lx7X76VscnYWRjC8z 66kxy+ezwCo4rnTWaWDW3/538haisI15yoz9lpRHmQ0i//vqPcVjKRHhAnd64Cm4DW8q nhqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=uh+xgRKLlu0pAy51Rt97gPvvJ/mFYbA7UbcjFuIwMg4=; b=j0NFJ6HMzto9PUkZHAffw6gkiMK9+9YejNrSTEC/yvBdI61pd9v9Pzc4ikVOGrFc4P 1i0lNdLA+jHkGvd5KpZnEnZkEDuQXqdMRYGRUJz2N8CnEGT48c2EMCBOfKQMWWn4ZAks V2QcX6NhmQ5RWxDjzXgglY3shrw6Pr5FIYL2eV+r4kZnDCEp3g7UzmP4tT+K7n2bcr9U Fx5MbdvKSJPwTsuJOSuoXkOsmP6T0j6+D2VmLNmriDn9WCdl5NRnf4zCyevFe/HFoVmH Hd2mXVMl+3FVDx/ZmPjRjeu5rY5BePhi4RvHVTw1w90a2pbkedcEHIbE+TgcdAcIpExr viJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dnQRe12w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p79-v6si1723570qkl.154.2018.07.17.13.17.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:17:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dnQRe12w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWPC-00017x-SH for patch@linaro.org; Tue, 17 Jul 2018 16:17:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBX-0000cP-R9 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBT-0001gx-RX for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBT-0001gF-Kd for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:55 -0400 Received: by mail-wr1-x444.google.com with SMTP id t6-v6so2394444wrn.7 for ; Tue, 17 Jul 2018 13:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uh+xgRKLlu0pAy51Rt97gPvvJ/mFYbA7UbcjFuIwMg4=; b=dnQRe12wcM1a/Mb5pisJ8Oyd29ayhojr26CV70jCfrDLEDmmtVahs2NPz9D3EJA3iB QPkNSB/x1QFBnXFDHuyqsIZ4kh3oTJxquCDvItjO5QObbo03nwf/SqGo0f0XlZ/Pebq0 qvRgX/1kWRlRbG5i4Ls07KZzVj2gIAQXU11vs= 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=uh+xgRKLlu0pAy51Rt97gPvvJ/mFYbA7UbcjFuIwMg4=; b=a75SdW8EmXS22j16GrUb9z7ooWAVYYaDatEvzkq1vsJXVbkB+Rb5dkaFzSGtBUlXCO kHSWplDQUNyQcv9WP0pOZ9d0P1cTqCDGk3fmCMFEx4OUUpSyJIVosG+l1qW+3xM1TuRZ /mgivXDaP5bMj3I+iuRNTnkKKAsGTIrxa1KEWedtQr5z4JKauXSQqQZW3ijFw9LqB4Dp Na2HF30lSNfcuQ9Xk0Wlxhnetboj0IE2pN8aT0E8PJcKQYR8uNdhRAjC41xehbCMz19b jyjjwlQ1u93UqQ2bmVtSBS2unS1npknVZDR1gF62/VoQPHNSm9tz7FmwK7QT6ff/U5Zf OMkA== X-Gm-Message-State: AOUpUlFEMD4ishPXQi6OuZiF9a6uuXbzsZLzCPznWxzIdgeuBKvseqtJ XcD5JxDQqfGuHkG2lNLwC7/QxQ== X-Received: by 2002:adf:9086:: with SMTP id i6-v6mr2262649wri.271.1531857774416; Tue, 17 Jul 2018 13:02:54 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m144-v6sm298273wma.36.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1EF8C3E0D6A; Tue, 17 Jul 2018 20:55:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:51 +0100 Message-Id: <20180717195553.9111-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 for 3.0 16/18] docker: ignore distro versioning of debootstrap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We do a minimum version check for the debootstrap but if the distro has added their own minor version tick it would fail and fall-back to the SCM version. This is sub-optimal as the latest/greatest version may be broken at any one particular time. We fix that with a little sed magic on the version string before passing to our ugly shell versioning check. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/debian-bootstrap.pre | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index ea324d6e4a..3b0ef95374 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -56,10 +56,13 @@ if [ -z $DEBOOTSTRAP_DIR ]; then if [ -z $DEBOOTSTRAP ]; then echo "No debootstrap installed, attempting to install from SCM" NEED_DEBOOTSTRAP=true - elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --version \ - | cut -d ' ' -f 2) | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -c &>/dev/null; then - echo "debootstrap too old, attempting to install from SCM" - NEED_DEBOOTSTRAP=true + else + INSTALLED_VERSION=$(${DEBOOTSTRAP} --version | sed 's/debootstrap \([0-9\.]*\)[^0-9\.]*.*/\1/') + if ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; echo "${INSTALLED_VERSION}") \ + | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C ; then + echo "debootstrap too old, attempting to install from SCM" + NEED_DEBOOTSTRAP=true + fi fi if $NEED_DEBOOTSTRAP; then DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git From patchwork Tue Jul 17 19:55:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142213 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4078558ljj; Tue, 17 Jul 2018 13:06:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdgy2DlGXYYR/B7cONyfz2K6Tp3FnDZNs2RpbzXyLhqkBKf9ktEp1heieJipujTEVA+d1hd X-Received: by 2002:a37:641:: with SMTP id 62-v6mr2904269qkg.227.1531858001535; Tue, 17 Jul 2018 13:06:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858001; cv=none; d=google.com; s=arc-20160816; b=cEIUhaSDUYpQTITuX/8bIV+SyhsH3deP49k+CT+Cp0XRKMcDKblvjPqp38h71MUWpF j5awCRUkBEME57ooT/jgY6AcbDxFHkOizo6s9FGR5VBV6KnaNf5YEiYdqjj45zuUSe7X DZFRd5x3CdjrFvfYcWsjf98SOCmngVgkmxQ6Iqhkzx6yaIhKn89XSwKkYMFugJqBelaT 9ZcgZWavCEawKSEzLhf2ACEuOt/Ie42BkVq+VehhR9iwumBKh+VZNVIUpyoSsuWK28da H9icYVWpxvRmTUd6sawNK6P1x9igEpi8TGIEP4ijHpdo9VR3xHfDEd3OEhiJi5cQIF1W a5Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Uo3rRHX/CxkGdJt3ZfpfWFyhxy9sw2jyW1uYilOJI94=; b=T9vyRfoNOj2yAta4xo/L9d8DiFsBuEsmzplN0C461/otzfBe7lgjSWsgfaTIk+nJA3 ihB2utz59IBy67ePVBhnhjILF9eJtdZvHRuClv1PnEqLiA5AqY5yS0+ZbY4ewjeT+jaC drwMOh3CvCIp5T055VwjQBzZmrORDzPHmwllXn71X68k3TB0pu19AWBUZIUHKTf+j1Zn xIzxBF7xSRhfpVCLy4sxGBoRyFukzx248wL2doB/COApONDSSkYN6/a6zEDmFFLkLfAk t933VRc4Z01HkQRqxqapMrv8pc5npxCoFbEL7AykNspJmxfnfra2LCNWKiOwlN2bxMy9 E5ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=COn7I6p8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o2-v6si1588580qkf.348.2018.07.17.13.06.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:06:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=COn7I6p8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWF6-0003Fb-PP for patch@linaro.org; Tue, 17 Jul 2018 16:06:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBX-0000cV-Sk for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBS-0001gK-WD for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBS-0001fn-On for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:54 -0400 Received: by mail-wr1-x42e.google.com with SMTP id h10-v6so2397349wre.6 for ; Tue, 17 Jul 2018 13:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uo3rRHX/CxkGdJt3ZfpfWFyhxy9sw2jyW1uYilOJI94=; b=COn7I6p82KG4HrkCfj7hKTvJpO5ST8gzPrjnzOdnBEcmUfPVNpsd3nWAMNsLL/HnLO y+Dk/VE3+RyvgNoVjPdAjXKSGjaxQ5R7P5rl/juGZKVcyHGV2WTYDdTnBcTKEW36uQYE SdaunzfJqMzDYFP77pYS2ckUorlitYw52PDlM= 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=Uo3rRHX/CxkGdJt3ZfpfWFyhxy9sw2jyW1uYilOJI94=; b=ATH121Xzv1QRS06ARLgN4hYVll/pDrE4txcOjGziP4aatelpdUjpzfVPOnKT7dvd8B MZ3plIvVvorROHcnt7LSy/P3HhaoT2BcM/cozb0p5vTfZsf/Vo7Mxp6CHPjlUy4ciwaL zVhJqPG9FDF0LL16gMVRpM3P7AfJlll00xIP848HndRx6O1zlyegrQDocS56+GEsWK/7 eOCx2fgim6twcWYjFDrtDCRr0EREpgO2QXhoeS4TwtkCuRCTm375p2eQLpfN/QxHin5D B4MHBcf9LaxyHdMjKi47MrN4KZPang2yFMeVAmpmC/kqE1UC1IC+NywnbxqbOLiYXvpF ZZwg== X-Gm-Message-State: AOUpUlHjSzM5b9lCY0nwGvdmKsxv+IivnfyJk6haAD2dGWsQXsmov3jr WreZED7GmRbBacPMhpoaQwMb2A== X-Received: by 2002:a5d:514d:: with SMTP id u13-v6mr2349346wrt.162.1531857773583; Tue, 17 Jul 2018 13:02:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x7-v6sm2589072wrr.95.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 31C923E032A; Tue, 17 Jul 2018 20:55:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:52 +0100 Message-Id: <20180717195553.9111-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v3 for 3.0 17/18] docker: perform basic binfmt_misc validation in docker.py X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Setting up binfmt_misc is outside of the scope of the docker.py script but we can at least validate it with any given executable so we have a more useful error message than the sed line of deboostrap failing cryptically. Signed-off-by: Alex Bennée Reported-by: Richard Henderson --- tests/docker/docker.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 523f4b95a2..a3f5b0c1b0 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -112,6 +112,31 @@ def _copy_binary_with_libs(src, dest_dir): so_path = os.path.dirname(l) _copy_with_mkdir(l , dest_dir, so_path) + +def _check_binfmt_misc(executable): + """Check binfmt_misc has entry for executable in the right place. + + The details of setting up binfmt_misc are outside the scope of + this script but we should at least fail early with a useful + message if it won't work.""" + + binary = os.path.basename(executable) + binfmt_entry = "/proc/sys/fs/binfmt_misc/%s" % (binary) + + if not os.path.exists(binfmt_entry): + print ("No binfmt_misc entry for %s" % (binary)) + return False + + with open(binfmt_entry) as x: entry = x.read() + + qpath = "/usr/bin/%s" % (binary) + if not re.search("interpreter %s\n" % (qpath), entry): + print ("binfmt_misc for %s does not point to %s" % (binary, qpath)) + return False + + return True + + def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images if img_name.startswith("debian") and img_name.endswith("user"): @@ -315,6 +340,11 @@ class BuildCommand(SubCommand): # Create a docker context directory for the build docker_dir = tempfile.mkdtemp(prefix="docker_build") + # Validate binfmt_misc will work + if args.include_executable: + if not _check_binfmt_misc(args.include_executable): + return 1 + # Is there a .pre file to run in the build context? docker_pre = os.path.splitext(args.dockerfile)[0]+".pre" if os.path.exists(docker_pre): From patchwork Tue Jul 17 19:55:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142212 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4077699ljj; Tue, 17 Jul 2018 13:05:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc3m+yoTDAGhzzeihwlNIqp6a+d2PbZaTuyp2U1iCj+2dvvKdz6me7A7Q47aA0PFV1RJDK0 X-Received: by 2002:a0c:9208:: with SMTP id a8-v6mr3395125qva.47.1531857944789; Tue, 17 Jul 2018 13:05:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857944; cv=none; d=google.com; s=arc-20160816; b=fvmT/PGXjVslLTQX0vZl6Jfh/Ke5pUfEvB7Rjeh/iWcROgScxRZxtBHECGhXPcxuVY mVmH9l+VEmHqMCFPbNmane9ZZZSe1Zola59uHlfFDM4ISb9VXYc30Sv3LmObmgwOC7i6 Q5HSrHw1U+mIooQXS3K3SajbCX7NWy+19ZT8YdiGxxJs+GpKy7prRvBllztAVCpRfV8h Lpz11lqmQabBHKZz+GCVuSiU4IjbTDRHueo0E2KkNAkx/zo+RRMBHMLX4Ttvsxf/XQtk Y5Dn0TjLzpPuJNU22irTF2qcBmqPXTNpR4g5/lJMqXh63o9eJNVXqEng6eonQ2Y3GLNE UfvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=md6KBT6sv4D2C7CTWsFSg25vSfxSxCtAwGwKddLSd4w=; b=q59ycd3koK7zSNuprZT6WmoNysTORbdKp/xR2euc2qLP2ZO26GFmTuJTgKqimJCbKA TaR2FOv11H3I0Vr1Z1OOD4Ef9YZJeWmzqlWNMW44S3SYdPR+9Y9KcKl0spjZ2B/X1WGL CP8kLvN285AIKZuJlOMT9vh794HM4t4XIU/zrVEa0dc2YDZWaCkOxLfPIAhOqjop7dh1 i6hw7uCfQn1sGStlPdpH2GuLp+AodpFtf9SytWwPF3tpGbXh7plF+071K671mDTn+lXz 6/SuEjWBljNWtIBaA7EKL9mCo2Mw0Hv0Gm52H1Av2O5jGiphzmhQGgzqAS7JZGoCZ62H DTig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=T5FjqH2c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m5-v6si1603741qte.73.2018.07.17.13.05.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:05:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=T5FjqH2c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWEC-0001IK-0T for patch@linaro.org; Tue, 17 Jul 2018 16:05:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4z-00039u-At for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4w-0004nE-RE for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:13 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4w-0004mr-Gh for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:10 -0400 Received: by mail-wr1-x441.google.com with SMTP id e7-v6so2378472wrs.9 for ; Tue, 17 Jul 2018 12:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=md6KBT6sv4D2C7CTWsFSg25vSfxSxCtAwGwKddLSd4w=; b=T5FjqH2cZWc/QjmlqmfrWroGLrv42qz+XdUtbqKta2VyUgFinSd83lBK83g4Lx2ra3 6q8CBHcKv/tbhDbS6FjebJE/YCL7uDDkrweyq6YjVBncbcodhe8XizNzBp88smV3KX3W 2Jwf5Ko3wxFHu6CyOGptNWLHXj8YystwvVxyk= 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=md6KBT6sv4D2C7CTWsFSg25vSfxSxCtAwGwKddLSd4w=; b=FgUqiHdAlyZkemcI1ebW/LNe1oy9PHP24XWpcENM87s4y3ttjJaRsgQrwHTrDVHZWy bHPBPLQ7GakKCfcBdP1rQ6gIjmmMkQCfDt8jmD3chAncX5UGFEw4IbOdjEOghvxUFzHI LBt3vXtcfCcmnty+8pgsh1fhzerHV6sOH0ruzjiA7+5DWU9tu0vnMoudKG0fLCgiEMBe vrcgQRsVDR1H+qaPkemdQ8eoRcGmPK239LKqym1c2FWMQGRhJ2YyEVkHjxpYwIeKV6G1 B/YQPtfYAvu7Vx2JZPK/tfsDTxqzfY+TQsLccqC4ffmm2wcw0e3V8eoAi/dvHKP6yegV vesw== X-Gm-Message-State: AOUpUlFDZEKTaPjO1P+vHDGJxZZRjAjOmRKDSOT4HlvUfTjyhr8+S/4K dDqA4/croQ9JqiAoIYxwST77zw== X-Received: by 2002:a5d:4643:: with SMTP id j3-v6mr2275684wrs.52.1531857369168; Tue, 17 Jul 2018 12:56:09 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t70-v6sm780623wme.7.2018.07.17.12.55.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 477393E0D8A; Tue, 17 Jul 2018 20:55:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:53 +0100 Message-Id: <20180717195553.9111-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v3 for 3.0 18/18] tests/tcg: remove runcom test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The combination of being rather esoteric and needing to support mmap @ 0 means this only ever worked under translation. It has now regressed even further and is no longer useful. Kill it. Signed-off-by: Alex Bennée --- tests/tcg/i386/Makefile.target | 5 - tests/tcg/i386/README | 3 - tests/tcg/i386/pi_10.com | Bin 54 -> 0 bytes tests/tcg/i386/runcom.c | 192 --------------------------------- 4 files changed, 200 deletions(-) delete mode 100644 tests/tcg/i386/pi_10.com delete mode 100644 tests/tcg/i386/runcom.c -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index c1997a1624..b4033ba3d1 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -29,11 +29,6 @@ test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ $( -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -extern int vm86 (unsigned long int subfunction, - struct vm86plus_struct *info); - -#define VIF_MASK 0x00080000 - -//#define SIGTEST - -#define COM_BASE_ADDR 0x10100 - -static void usage(void) -{ - printf("runcom version 0.1 (c) 2003 Fabrice Bellard\n" - "usage: runcom file.com\n" - "VM86 Run simple .com DOS executables (linux vm86 test mode)\n"); - exit(1); -} - -static inline void set_bit(uint8_t *a, unsigned int bit) -{ - a[bit / 8] |= (1 << (bit % 8)); -} - -static inline uint8_t *seg_to_linear(unsigned int seg, unsigned int reg) -{ - return (uint8_t *)((seg << 4) + (reg & 0xffff)); -} - -static inline void pushw(struct vm86_regs *r, int val) -{ - r->esp = (r->esp & ~0xffff) | ((r->esp - 2) & 0xffff); - *(uint16_t *)seg_to_linear(r->ss, r->esp) = val; -} - -void dump_regs(struct vm86_regs *r) -{ - fprintf(stderr, - "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n" - "ESI=%08lx EDI=%08lx EBP=%08lx ESP=%08lx\n" - "EIP=%08lx EFL=%08lx\n" - "CS=%04x DS=%04x ES=%04x SS=%04x FS=%04x GS=%04x\n", - r->eax, r->ebx, r->ecx, r->edx, r->esi, r->edi, r->ebp, r->esp, - r->eip, r->eflags, - r->cs, r->ds, r->es, r->ss, r->fs, r->gs); -} - -#ifdef SIGTEST -void alarm_handler(int sig) -{ - fprintf(stderr, "alarm signal=%d\n", sig); - alarm(1); -} -#endif - -int main(int argc, char **argv) -{ - uint8_t *vm86_mem; - const char *filename; - int fd, ret, seg; - struct vm86plus_struct ctx; - struct vm86_regs *r; - - if (argc != 2) - usage(); - filename = argv[1]; - - vm86_mem = mmap((void *)0x00000000, 0x110000, - PROT_WRITE | PROT_READ | PROT_EXEC, - MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); - if (vm86_mem == MAP_FAILED) { - perror("mmap"); - exit(1); - } -#ifdef SIGTEST - { - struct sigaction act; - - act.sa_handler = alarm_handler; - sigemptyset(&act.sa_mask); - act.sa_flags = 0; - sigaction(SIGALRM, &act, NULL); - alarm(1); - } -#endif - - /* load the MSDOS .com executable */ - fd = open(filename, O_RDONLY); - if (fd < 0) { - perror(filename); - exit(1); - } - ret = read(fd, vm86_mem + COM_BASE_ADDR, 65536 - 256); - if (ret < 0) { - perror("read"); - exit(1); - } - close(fd); - - memset(&ctx, 0, sizeof(ctx)); - /* init basic registers */ - r = &ctx.regs; - r->eip = 0x100; - r->esp = 0xfffe; - seg = (COM_BASE_ADDR - 0x100) >> 4; - r->cs = seg; - r->ss = seg; - r->ds = seg; - r->es = seg; - r->fs = seg; - r->gs = seg; - r->eflags = VIF_MASK; - - /* put return code */ - set_bit((uint8_t *)&ctx.int_revectored, 0x21); - *seg_to_linear(r->cs, 0) = 0xb4; /* mov ah, $0 */ - *seg_to_linear(r->cs, 1) = 0x00; - *seg_to_linear(r->cs, 2) = 0xcd; /* int $0x21 */ - *seg_to_linear(r->cs, 3) = 0x21; - pushw(&ctx.regs, 0x0000); - - /* the value of these registers seem to be assumed by pi_10.com */ - r->esi = 0x100; - r->ecx = 0xff; - r->ebp = 0x0900; - r->edi = 0xfffe; - - for(;;) { - ret = vm86(VM86_ENTER, &ctx); - switch(VM86_TYPE(ret)) { - case VM86_INTx: - { - int int_num, ah; - - int_num = VM86_ARG(ret); - if (int_num != 0x21) - goto unknown_int; - ah = (r->eax >> 8) & 0xff; - switch(ah) { - case 0x00: /* exit */ - exit(0); - case 0x02: /* write char */ - { - uint8_t c = r->edx; - write(1, &c, 1); - } - break; - case 0x09: /* write string */ - { - uint8_t c; - for(;;) { - c = *seg_to_linear(r->ds, r->edx); - if (c == '$') - break; - write(1, &c, 1); - } - r->eax = (r->eax & ~0xff) | '$'; - } - break; - default: - unknown_int: - fprintf(stderr, "unsupported int 0x%02x\n", int_num); - dump_regs(&ctx.regs); - // exit(1); - } - } - break; - case VM86_SIGNAL: - /* a signal came, we just ignore that */ - break; - case VM86_STI: - break; - default: - fprintf(stderr, "unhandled vm86 return code (0x%x)\n", ret); - dump_regs(&ctx.regs); - exit(1); - } - } -}