From patchwork Tue Jul 24 10:50:59 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: 142762 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7123368ljj; Tue, 24 Jul 2018 04:02:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdppGkUayDRISbpEjuMkxNNQCILUy4kLngEybSjNLH7FpePrPipoUEErJSmaDKQPdvziLOX X-Received: by 2002:a0c:d805:: with SMTP id h5-v6mr14683465qvj.12.1532430125173; Tue, 24 Jul 2018 04:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532430125; cv=none; d=google.com; s=arc-20160816; b=bu0vKD0OKTmo/QSbJmhzc+at0E20d32qbQO+z+FYjvUEuQ2LHplQAeicba/IKXKnT6 UaEQDBtr2iIVMqcTfcwCt7OW9n3LfL2ii7SUBG/xU9zByQYqK7hZDK95/iC2PR6+SOPI zVh9DihNDgskeTVUepWDAa6CfIlUsI6YRyfVORyMe2+Jc168wXfUQBfd6VB0gbUWFnak aqtcs5TlkHlp+Xi3oF3xKkinXfCAoytzo/iruzEUW37vDrSbjE/a6i0YDyhY2aP3a3di ZP53l2cemE7E6mxl5w29ZG4Np46WPYdmbcpt/MLtx7IF/U8HicJBYOeKxbYNALKdpuW8 q1VA== 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=aDn7+pNytd+9/TrsnS9pnTelzmPIf8iGN3kw0oQCgKo=; b=ZuR0PqOtqKBLGKpst7Ga7WJT3RAtzh3CkQSVeBGAO32cOOout9hodFQ5jrSqtGMWkG GuU+bzbkXp02aQAWryKy3GK2u+CVGfp7GsWaNRlzatjJ+XFM0GO6meVr4hvyoR6dim0H oY0cBx+c4n6MSO4hN8oFVg2Fiv22OTxLQk/vUP8gUmQ/lBKPvtjJ0DlrqVVXOuD4QFfk jvHvZO9/yUlqqXFy+PSFTg0k9EZXZ3UQL4w860xpqjGjpFoNUHS0ac2l68rRX7bM0ee6 pO37rpGt/RmogGOjwAmsRf15pJCZZIIZXM5HL85GyJ4874KCBvlm8Efc/TebOqRDKDfP V+Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ht4jokD3; 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 s8-v6si4541779qtn.387.2018.07.24.04.02.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jul 2018 04:02:05 -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=ht4jokD3; 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]:39492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhv4t-0000y9-Jz for patch@linaro.org; Tue, 24 Jul 2018 07:02:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuW-0000t1-Qr for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuW-0006UM-4H for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:36797) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuV-0006TH-Ta for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: by mail-wm0-x235.google.com with SMTP id s14-v6so2074359wmc.1 for ; Tue, 24 Jul 2018 03:51:19 -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=aDn7+pNytd+9/TrsnS9pnTelzmPIf8iGN3kw0oQCgKo=; b=ht4jokD3yFXgJWgf2qAJetZILRquMN6wcaBSVxNcB4gB1YMTEQccxd7Bw9oilSyS0/ d3EoGmbQtRd1b4N9FywNwnfG8mPoda3KsTF2pbbQJf5sOciSolZ4+UoWvpmt3FlZW90K pc7SKqSIurMFv6kKE8LbFcnIE6oQ+r8w3U0m0= 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=aDn7+pNytd+9/TrsnS9pnTelzmPIf8iGN3kw0oQCgKo=; b=cWEm8W0ZatBY3jjiqiupI2wlm1C1RVukM88/rziiG8FBcLMxKVOtUtJa7ZUgRWFgjh /nGR2PIzrtFBJAwEjNxoW+CU2/lNF0l0lMHKoFLH6YlcRxJfVTXpNSq8tygn0i/Jlq3P psIm00ZKJ3QwCZumPowzF5dxgxIHzjVvgLi8oS+bEl+63GGXuhUA84roTjspdZ8XpZ9T P1ZsVt7rcnk3s7zPcR6FcKewrwxPOYLEk40Vue/sggw7qlZA/U5nk9qdn9OVQvhHK1NB f8dzjlq3egf8mzWUJhIH0Yw8gLwMI0tUuL1vb0GLzSvWofFxnKwpuJm80h8/rFCeCFVo gppw== X-Gm-Message-State: AOUpUlG7L1DywyG/q9jm6lL0+nD4L1sHhEcGOV8ivTSS5JoVhVyDLqHP ciUXfEHhbwrUH+eLG7hl5yoIW+TA2Gc= X-Received: by 2002:a1c:e5cd:: with SMTP id c196-v6mr1611411wmh.101.1532429478870; Tue, 24 Jul 2018 03:51:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x14-v6sm10417088wrv.21.2018.07.24.03.51.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6D9D63E067B; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:59 +0100 Message-Id: <20180724105109.8392-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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] [PULL 07/17] 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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é -- 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()