Message ID | 20180619154435.18898-51-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="SSNw7HV4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 419Czj3dbsz9s4v for <incoming@patchwork.ozlabs.org>; Wed, 20 Jun 2018 02:27:28 +1000 (AEST) Received: from localhost ([::1]:43616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fVJTY-0007s7-Mx for incoming@patchwork.ozlabs.org; Tue, 19 Jun 2018 12:27:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIvW-0004JC-LX for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIvJ-0001tF-6b for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:14 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIvI-0001s3-S1 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:01 -0400 Received: by mail-wm0-x242.google.com with SMTP id e16-v6so1229584wmd.0 for <qemu-devel@nongnu.org>; Tue, 19 Jun 2018 08:52: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=ET+CSKQxqjllrHu59h0vn/aj61cZ2KNVxA7OHOFNObg=; b=SSNw7HV44wbFwR4LVhw5lf51WshPh1gxRDZSVkVMhQ46g4SxOIk8M1mA7s1AhAXo/O 0p9Suf5DyXMeze7wzv03e6VdKHlM8E6CLotFWye3KBcbe0DIwhRz/6iij4rTBfIDlVWe XxS1jpp0JRTTG/XYUK9MdX97+WnTqfh8y3H+c= 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=ET+CSKQxqjllrHu59h0vn/aj61cZ2KNVxA7OHOFNObg=; b=nm5UOp3Tde6eq78rxA2GHGoJuCRWqSBD6YRJMq9h5/ubHOdbDrPFRl8wz4U937dbmk +UrJgB/ZiqB6rIDi3CPdRVFes4kZgqZcqE6GCVWrGfwSJ4AS+U19jCqOl/vgt9hTdWm+ RiuviVa1N8DOpLAoVZMBfW2/LW1LDiO0+XcLiVu9w24hs+J3rIULbISwWWfGcvfaye5w eaKNtO10yPjOKWV68oaYfv95njq68g2BaFDXyCcKsSVVRTJfhjwtpEg3xyTKqTyWzOkE cURBD2kZNddxLghG11pjwsKb3sKF1lypl08zpWEUvCJi0d3NriFXa9jKo293UXROvMJp 6ELg== X-Gm-Message-State: APt69E1NLJJhij4eV3o/fXXbI9qBt/Q1OLwRabFB2Q5xpfyn9UUwLnUZ I6SKn1HXUr9Fj49EX4YEaau/vw== X-Google-Smtp-Source: ADUXVKIaiF2okOpi4cJjKAkgTBCj72p6xVAPhqVCuGIA4ZtRn1CLMdXJWouTODonn0n+OqtX0QoamA== X-Received: by 2002:a1c:78b:: with SMTP id 133-v6mr13214645wmh.59.1529423519468; Tue, 19 Jun 2018 08:51:59 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h4-v6sm1689wre.89.2018.06.19.08.51.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E9A2A3E08BB; Tue, 19 Jun 2018 16:44:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:29 +0100 Message-Id: <20180619154435.18898-51-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/56] configure: add support for --cross-cc-FOO
|
expand
|
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..e6685f6d81 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -49,7 +49,9 @@ def _guess_docker_command(): commands = [["docker"], ["sudo", "-n", "docker"]] for cmd in commands: try: - if subprocess.call(cmd + ["images"], + # docker version will return the client details in stdout + # but still report a status of 1 if it can't contact the daemon + if subprocess.call(cmd + ["version"], stdout=DEVNULL, stderr=DEVNULL) == 0: return cmd except OSError:
The "images" command is a fairly heavyweight command to run as it involves searching the whole docker file-system inventory. On a machine with a lot of images this makes start-up fairly expensive. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- v8 - use version instead of ps, add comment