Skip to content

Commit 0dce884

Browse files
committed
Merge tag 'linux-kselftest-fixes-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan: "tpm test fixes from Jarkko Sakkinen" * tag 'linux-kselftest-fixes-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: tpm: Use /bin/sh instead of /bin/bash selftests: tpm: Use 'test -e' instead of 'test -f' Revert "tpm: selftest: cleanup after unseal with wrong auth/policy test"
2 parents 5584474 + 377ff83 commit 0dce884

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
33

44
# Kselftest framework requirement - SKIP code is 4.
55
ksft_skip=4
66

7-
[ -f /dev/tpm0 ] || exit $ksft_skip
7+
[ -e /dev/tpm0 ] || exit $ksft_skip
88

99
python -m unittest -v tpm2_tests.SmokeTest
1010
python -m unittest -v tpm2_tests.AsyncTest
11-
12-
CLEAR_CMD=$(which tpm2_clear)
13-
if [ -n $CLEAR_CMD ]; then
14-
tpm2_clear -T device
15-
fi
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
33

44
# Kselftest framework requirement - SKIP code is 4.
55
ksft_skip=4
66

7-
[ -f /dev/tpmrm0 ] || exit $ksft_skip
7+
[ -e /dev/tpmrm0 ] || exit $ksft_skip
88

99
python -m unittest -v tpm2_tests.SpaceTest

0 commit comments

Comments
 (0)