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()