From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BAA2C18E5A for ; Tue, 10 Mar 2020 13:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3159E24694 for ; Tue, 10 Mar 2020 13:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846780; bh=3TigfwXrdUcwuJtxDdM91sunQiw06FIrpMZszuW3/3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p7RTqucMG5NuhyZkjnkeQtZuki67mNCLekBSTfW1pl7WBBh6Fw70j7tpZLQxeqRs9 JIvzV+FYe3yVBUrYMnwY877+DKSCLEPnywlymnSkM9c+uhGe9I+t2MUjLZtANf9Pm+ OeJRncWtOGvivMQCPTw7r4IlvNuv2mnPtlua7K8E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729431AbgCJN0T (ORCPT ); Tue, 10 Mar 2020 09:26:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35074 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729605AbgCJM4B (ORCPT ); Tue, 10 Mar 2020 08:56:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 733462253D; Tue, 10 Mar 2020 12:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844960; bh=3TigfwXrdUcwuJtxDdM91sunQiw06FIrpMZszuW3/3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C1RLOHpXWqO6NVUXaeKBKzB9Zty2v4Lhwg0ldQ15dt3FpbkHLW4c8lz+oBmL9zjL6 iCC2BeS3Znl0Dw8Dc1bJLsmyWhpqc0MYrp9C6EQ5djUG8xDnfTGNKiEc9o6RyBbgEk xScLA4JQ5Gztxc8pb6aUO7J5f87hmhQa8vJBwTI4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikita Sobolev , Shuah Khan , Sasha Levin Subject: [PATCH 5.5 014/189] Kernel selftests: tpm2: check for tpm support Date: Tue, 10 Mar 2020 13:37:31 +0100 Message-Id: <20200310123640.975059538@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123639.608886314@linuxfoundation.org> References: <20200310123639.608886314@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikita Sobolev [ Upstream commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc ] tpm2 tests set fails if there is no /dev/tpm0 and /dev/tpmrm0 supported. Check if these files exist before run and mark test as skipped in case of absence. Signed-off-by: Nikita Sobolev Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/tpm2/test_smoke.sh | 13 +++++++++++-- tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index 8155c2ea7ccbb..b630c7b5950a9 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -1,8 +1,17 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +self.flags = flags -python -m unittest -v tpm2_tests.SmokeTest -python -m unittest -v tpm2_tests.AsyncTest +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + + +if [ -f /dev/tpm0 ] ; then + python -m unittest -v tpm2_tests.SmokeTest + python -m unittest -v tpm2_tests.AsyncTest +else + exit $ksft_skip +fi CLEAR_CMD=$(which tpm2_clear) if [ -n $CLEAR_CMD ]; then diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh index a6f5e346635e5..180b469c53b47 100755 --- a/tools/testing/selftests/tpm2/test_space.sh +++ b/tools/testing/selftests/tpm2/test_space.sh @@ -1,4 +1,11 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -python -m unittest -v tpm2_tests.SpaceTest +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +if [ -f /dev/tpmrm0 ] ; then + python -m unittest -v tpm2_tests.SpaceTest +else + exit $ksft_skip +fi -- 2.20.1