diff options
| author |   Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2020-04-12 17:23:07 +0300 |
|---|---|---|
| committer |   Shuah Khan <skhan@linuxfoundation.org> | 2020-04-14 10:08:24 -0600 |
| commit | aaa2d92efe1f972567f1691b423ab8dc606ab3a9 (patch) | |
| tree | b40fc682a2300182fc66408cf22432fa7b699f40 /tools/testing/selftests/tpm2 | |
| parent | selftests/ftrace: Add CONFIG_SAMPLE_FTRACE_DIRECT=m kconfig (diff) | |
| download | wireguard-linux-aaa2d92efe1f972567f1691b423ab8dc606ab3a9.tar.xz wireguard-linux-aaa2d92efe1f972567f1691b423ab8dc606ab3a9.zip | |
Revert "Kernel selftests: tpm2: check for tpm support"
This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc.
The original comment was neither reviewed nor tested. Thus, this the
*only* possible action to take.
Cc: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/tpm2')
| -rwxr-xr-x | tools/testing/selftests/tpm2/test_smoke.sh | 13 | ||||
| -rwxr-xr-x | tools/testing/selftests/tpm2/test_space.sh | 9 |
2 files changed, 3 insertions, 19 deletions
diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index b630c7b5950a..8155c2ea7ccb 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -1,17 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -self.flags = flags -# 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 +python -m unittest -v tpm2_tests.SmokeTest +python -m unittest -v tpm2_tests.AsyncTest 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 180b469c53b4..a6f5e346635e 100755 --- a/tools/testing/selftests/tpm2/test_space.sh +++ b/tools/testing/selftests/tpm2/test_space.sh @@ -1,11 +1,4 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -# 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 +python -m unittest -v tpm2_tests.SpaceTest |