Merge tag 'linux-kselftest-fixes-5.8-rc4' of... (0dce8845) · Commits · 戴 / test

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"

tools/testing/selftests/tpm2/test_smoke.sh

+2 −7

Original line number	Diff line number	Diff line
		#!/bin/bash
		#!/bin/sh
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)

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

		[ -f /dev/tpm0 ] \|\| exit $ksft_skip
		[ -e /dev/tpm0 ] \|\| exit $ksft_skip

		python -m unittest -v tpm2_tests.SmokeTest
		python -m unittest -v tpm2_tests.AsyncTest

		CLEAR_CMD=$(which tpm2_clear)
		if [ -n $CLEAR_CMD ]; then
		tpm2_clear -T device
		fi

+2 −2

Original line number	Diff line number	Diff line
		#!/bin/bash
		#!/bin/sh
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)

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

		[ -f /dev/tpmrm0 ] \|\| exit $ksft_skip
		[ -e /dev/tpmrm0 ] \|\| exit $ksft_skip

		python -m unittest -v tpm2_tests.SpaceTest