| Message ID | 37ztyakgrrtgvec344mg7mspchwjpxxtsprtjidso3pwkmm4f4@awsa5mzgqmtb (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] selftests: tpm2: test_smoke: use POSIX-conformant expression operator | expand |
On Wed, Feb 12, 2025 at 01:16:17AM +0200, Ahmed Salem wrote: > Use POSIX-conformant expression operator symbol '='. > > The use of the non POSIX-conformant symbol '==' would work > in bash, but not in sh where the unexpected operator error > would result in test_smoke.sh being skipped. > > Instead of changing the shebang to use bash, which may not be > available on all systems, use the POSIX-conformant expression > symbol '=' to test for equality. > > Without this patch: > =================== > # make -j8 TARGETS=tpm2 kselftest > # selftests: tpm2: test_smoke.sh > # ./test_smoke.sh: 9: [: 2: unexpected operator > ok 1 selftests: tpm2: test_smoke.sh # SKIP > > With this patch: > ================ > # make -j8 TARGETS=tpm2 kselftest > # selftests: tpm2: test_smoke.sh > # Ran 9 tests in 9.236s > ok 1 selftests: tpm2: test_smoke.sh > > Signed-off-by: Ahmed Salem <x0rw3ll@gmail.com> Perfect, thanks a lot. Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Shuah, do you want to pick this or? BR, Jarkko
diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index 168f4b166234..3a60e6c6f5c9 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -6,6 +6,6 @@ ksft_skip=4 [ -e /dev/tpm0 ] || exit $ksft_skip read tpm_version < /sys/class/tpm/tpm0/tpm_version_major -[ "$tpm_version" == 2 ] || exit $ksft_skip +[ "$tpm_version" = 2 ] || exit $ksft_skip python3 -m unittest -v tpm2_tests.SmokeTest 2>&1
Use POSIX-conformant expression operator symbol '='. The use of the non POSIX-conformant symbol '==' would work in bash, but not in sh where the unexpected operator error would result in test_smoke.sh being skipped. Instead of changing the shebang to use bash, which may not be available on all systems, use the POSIX-conformant expression symbol '=' to test for equality. Without this patch: =================== # make -j8 TARGETS=tpm2 kselftest # selftests: tpm2: test_smoke.sh # ./test_smoke.sh: 9: [: 2: unexpected operator ok 1 selftests: tpm2: test_smoke.sh # SKIP With this patch: ================ # make -j8 TARGETS=tpm2 kselftest # selftests: tpm2: test_smoke.sh # Ran 9 tests in 9.236s ok 1 selftests: tpm2: test_smoke.sh Signed-off-by: Ahmed Salem <x0rw3ll@gmail.com> --- Changes in v4: - Include relevant parts of the script showing the issue before and after the patch Changes in v3: - Reword mistaken commit message Changes in v2: - Remove snippets pinpointing the issue from commit message tools/testing/selftests/tpm2/test_smoke.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 34c26c5e1cb0cc7f54c1b89c6e9168cad8ffb580