From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
Cc: linux-kselftest@vger.kernel.org,
Tadeusz Struk <tadeusz.struk@intel.com>,
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Alexey Brodkin <Alexey.Brodkin@synopsys.com>,
linux-kernel@vger.kernel.org, Jason Gunthorpe <jgg@ziepe.ca>,
Joey Pabalinas <joeypabalinas@gmail.com>,
Petr Vorel <petr.vorel@gmail.com>,
linux-integrity@vger.kernel.org,
linux-snps-arc@lists.infradead.org, Shuah Khan <shuah@kernel.org>,
Peter Huewe <peterhuewe@gmx.de>
Subject: Re: [PATCH] Kernel selftests: Add check if tpm devices are supported
Date: Tue, 19 May 2020 16:48:38 +0300 [thread overview]
Message-ID: <20200519134838.GA17129@linux.intel.com> (raw)
In-Reply-To: <20200518213934.23156-1-Nikita.Sobolev@synopsys.com>
On Tue, May 19, 2020 at 12:39:34AM +0300, Nikita Sobolev wrote:
> tpm2 tests set uses /dev/tpm0 and /dev/tpmrm0 without check if they
> are available. In case, when these devices are not available test
> fails, but expected behaviour is test to be skipped.
>
> Signed-off-by: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
tpm2 tests set -> TPM2 test suite
Fixes tag is also required.
There is nothing cool writing acronyms in lower case, so lets
just always write them correctly.
> ---
> tools/testing/selftests/tpm2/test_smoke.sh | 11 +++++++++--
> tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++-
> 2 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh
> index 8155c2ea7ccb..e55d3e400666 100755
> --- a/tools/testing/selftests/tpm2/test_smoke.sh
> +++ b/tools/testing/selftests/tpm2/test_smoke.sh
> @@ -1,8 +1,15 @@
> #!/bin/bash
> # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
>
> -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 a6f5e346635e..180b469c53b4 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.16.2
>
This would make the change more compact:
# Kselftest framework requirement - SKIP code is 4.
if [ ! -f /dev/tpmrm0 ] ; then
exit 4
fi
python -m unittest -v tpm2_tests.SpaceTest
(also for /dev/tpm0)
/Jarkko
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
prev parent reply other threads:[~2020-05-19 13:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 21:39 [PATCH] Kernel selftests: Add check if tpm devices are supported Nikita Sobolev
2020-05-18 21:50 ` Petr Vorel
2020-05-19 13:48 ` Jarkko Sakkinen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519134838.GA17129@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=Nikita.Sobolev@synopsys.com \
--cc=jgg@ziepe.ca \
--cc=joeypabalinas@gmail.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=peterhuewe@gmx.de \
--cc=petr.vorel@gmail.com \
--cc=shuah@kernel.org \
--cc=tadeusz.struk@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).