From patchwork Fri Jul 13 12:17:32 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: 141872 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp737947ljj; Fri, 13 Jul 2018 05:25:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfYNnEwY4GQHwhyigHj4JlLsTZh11UVhiPo/0/I5UfVut78Xe7G7CEk7GPMBU3kR3gvOa9W X-Received: by 2002:a37:70a:: with SMTP id 10-v6mr5410868qkh.393.1531484707528; Fri, 13 Jul 2018 05:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531484707; cv=none; d=google.com; s=arc-20160816; b=FdS66ju86V3cEgohiQCieOCqmmce2AJK88BcUDSOdjfxYYV9WbIiZIhaezS/qDeDR4 M8HrXi7KgtGD1UEXTV6A2OLwE6kgGFA8vDzy7MpZMF9MixO5swNnW234EYZKXGqfJzVX Zpd57JJm/6I4uglNZWrJPiOs+V8P+vDtuTA9itNKPVpQQSJy+FIqUt5pJ0hnF6KiXSjB WWxyP8YsyswZc6f5hLD9dh/Tw6KswsWhyFsC4UqSk2hfXdxfL72PuQ7PxT7jjd6Lp3EW KjB6BiIOYcPUcV2CnX8u99qci3ndaPzzb8bVKrdhyf1rG0tHfhMQog7M9gdU6F8qNuHo 2M2w== 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=AlTddQpaOXQWaw8ed9X7T+byMnYHXmjFINOkVJ22/bY=; b=DQx4cPi35f5zCAJNpX786LSOQNdYF52JKUeVRzL3Xd31ylsvtAD8TKtqhMD0JsbDWD ZyFLUMO73MDmroIQ2XfifZnSXS5Wy6P/CL4p18l84dT/ImJmC+Huv2Z87SAxzbAiV2oj Z0s6RfT8cXed6jtAZqPd2Q8CQKMzMTcldG2czIp2SC88XYouZHqBuY8DTopKpmW3Fd3E pCkIET97fk2hy8lEc0awde50taV/UDZ6XuYoC3gbJJ5r2C5uxSwqL/eIAwm3R0TFJTQU VAsp73oENicC72SGgrV0tEIFVcrwQNGxtrvl5jjf8xF2USOduRDdd943sN0XuWAHUwuU Y12g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UozXJeiF; 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 u52-v6si20019697qtb.234.2018.07.13.05.25.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 Jul 2018 05:25: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=UozXJeiF; 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]:36997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx8E-0002Bm-VD for patch@linaro.org; Fri, 13 Jul 2018 08:25:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1I-0004p6-D6 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1G-0003rR-Rj for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1G-0003qB-LO for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:54 -0400 Received: by mail-wr1-x42c.google.com with SMTP id b15-v6so24955637wrv.10 for ; Fri, 13 Jul 2018 05:17: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=AlTddQpaOXQWaw8ed9X7T+byMnYHXmjFINOkVJ22/bY=; b=UozXJeiFVqqDP1QjwZW1ce77DSKNlpFI9HAOBF0xJg/vCS7KGTjcPmfNiARhGuBGz8 sIrBQOmdpxD9RnmmrZxBEIp0o/+223UWJiC0TZZ27UBwnAPefVotaQ9HQbtSam0j+9kM kNL0/m/FaV+QtDkkZqBcZ3tTxOG7AlBMwePu8= 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=AlTddQpaOXQWaw8ed9X7T+byMnYHXmjFINOkVJ22/bY=; b=g/Vi8nNXzj51gg+90o8S/orQRA/An2fPVcv5FS1NOSdcUIZ7bVrHidHbxghadSxh3y vg0NhOUjGilEaxOrCvE0QgSXWOE1KYoXlPba084G9EttSmXG9pbJBAXEp0BGQpx+u0dZ 2uPPHRZI7TB130pTRr0mIZ5n62f/5qAhs1954sBkeeeHsYogIwwh62nhUw3fE53w5BdS SCa5kPfrEUmUXLgmwd9Z41scWcCICmDhMbQ3cCQXGkqa2Wap6g7Shu4TZR8JzBoc4nf6 scNdfvcwmvu0t7hzVfXtvmWEEGq5s/qC7r8NrxUidwHjFJHHz7/3pBlu6hzkadwzhrqY Csew== X-Gm-Message-State: AOUpUlGLDUsqUnlpwVEEaT+7CCUbLx0drR40ePY+MYn7UCEcDghfPW0t DNWiMcvqjLwStVnoC3tZh2Ee2w== X-Received: by 2002:adf:8e89:: with SMTP id q9-v6mr4793061wrb.261.1531484273693; Fri, 13 Jul 2018 05:17:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w24-v6sm7544078wmc.15.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7AB283E075D; Fri, 13 Jul 2018 13:17:42 +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: Fri, 13 Jul 2018 13:17:32 +0100 Message-Id: <20180713121741.19262-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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 v2 for 3.0 07/16] 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 --- tests/docker/common.rc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/common.rc b/tests/docker/common.rc index cfc620d554..6df431eb72 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -47,7 +47,13 @@ check_qemu() else TEST="$@" fi - make $MAKEFLAGS $TEST + + if type gtester > /dev/null 2>&1 && \ + gtester --version > /dev/null 2>&1; then + make $MAKEFLAGS $TEST + else + echo "No working gtester, skipping make $TEST" + fi } test_fail()