| Message ID | 20200412142309.71807-1-jarkko.sakkinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | aaa2d92efe1f972567f1691b423ab8dc606ab3a9 |
| Headers | show |
| Series | Revert "Kernel selftests: tpm2: check for tpm support" | expand |
On 4/12/20 8:23 AM, Jarkko Sakkinen wrote: > This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. > > The original comment commit I assume. was neither reviewed nor tested. Thus, this the > *only* possible action to take. > Bummer. I will apply this right away. > Cc: Nikita Sobolev <Nikita.Sobolev@synopsys.com> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > --- thanks, -- Shuah
On Tue, Apr 14, 2020 at 09:12:05AM -0600, shuah wrote: > On 4/12/20 8:23 AM, Jarkko Sakkinen wrote: > > This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. > > > > The original comment > > commit I assume. > > was neither reviewed nor tested. Thus, this the > > *only* possible action to take. > > > > Bummer. I will apply this right away. No worries, and fine with the change as long as I'm able to review and try it out :-) Sorry for the dull tone! /Jarkko
On Tue, Apr 14, 2020 at 10:37:25PM +0300, Jarkko Sakkinen wrote: > On Tue, Apr 14, 2020 at 09:12:05AM -0600, shuah wrote: > > On 4/12/20 8:23 AM, Jarkko Sakkinen wrote: > > > This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. > > > > > > The original comment > > > > commit I assume. > > > > was neither reviewed nor tested. Thus, this the > > > *only* possible action to take. > > > > > > > Bummer. I will apply this right away. > > No worries, and fine with the change as long as I'm able to > review and try it out :-) Sorry for the dull tone! I mean refined change after this revert has been applied. /Jarkko
On 4/14/20 1:38 PM, Jarkko Sakkinen wrote: > On Tue, Apr 14, 2020 at 10:37:25PM +0300, Jarkko Sakkinen wrote: >> On Tue, Apr 14, 2020 at 09:12:05AM -0600, shuah wrote: >>> On 4/12/20 8:23 AM, Jarkko Sakkinen wrote: >>>> This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. >>>> >>>> The original comment >>> >>> commit I assume. >>> >>> was neither reviewed nor tested. Thus, this the >>>> *only* possible action to take. >>>> >>> >>> Bummer. I will apply this right away. >> >> No worries, and fine with the change as long as I'm able to >> review and try it out :-) Sorry for the dull tone! > I usually wait for test authors to do the review. This patch was sent a while back and I ended up picking it up. It stayed in next for a while. It is fixed now. > I mean refined change after this revert has been applied. > Of course. I applied your revert to for my next pull request to linux-kselftest next thanks, -- Shuah
On Tue, Apr 14, 2020 at 02:52:12PM -0600, shuah wrote: > On 4/14/20 1:38 PM, Jarkko Sakkinen wrote: > > On Tue, Apr 14, 2020 at 10:37:25PM +0300, Jarkko Sakkinen wrote: > > > On Tue, Apr 14, 2020 at 09:12:05AM -0600, shuah wrote: > > > > On 4/12/20 8:23 AM, Jarkko Sakkinen wrote: > > > > > This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. > > > > > > > > > > The original comment > > > > > > > > commit I assume. > > > > > > > > was neither reviewed nor tested. Thus, this the > > > > > *only* possible action to take. > > > > > > > > > > > > > Bummer. I will apply this right away. > > > > > > No worries, and fine with the change as long as I'm able to > > > review and try it out :-) Sorry for the dull tone! > > > > I usually wait for test authors to do the review. This patch > was sent a while back and I ended up picking it up. It stayed > in next for a while. It is fixed now. > > > I mean refined change after this revert has been applied. > > > Of course. I applied your revert to for my next pull request > to linux-kselftest next > > thanks, > -- Shuah Thanks. /Jarkko
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
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> --- tools/testing/selftests/tpm2/test_smoke.sh | 13 ++----------- tools/testing/selftests/tpm2/test_space.sh | 9 +-------- 2 files changed, 3 insertions(+), 19 deletions(-)