Commit 3b07108a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-fixes-6.15-rc2' of... 

Merge tag 'linux_kselftest-fixes-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:

 - Fixes tpm2, futex, and mincore tests

 - Create a dedicated .gitignore for tpm2 tests

* tag 'linux_kselftest-fixes-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/mincore: Allow read-ahead pages to reach the end of the file
  selftests/futex: futex_waitv wouldblock test should fail
  selftests: tpm2: test_smoke: use POSIX-conformant expression operator
  selftests: tpm2: create a dedicated .gitignore
parents a2458824 197c1eaa

tools/testing/selftests/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ gpiogpio-hammer 
gpioinclude/

gpiolsgpio

kselftest_install/

tpm2/SpaceTest.log



# Python bytecode and cache

__pycache__/

tools/testing/selftests/futex/functional/futex_wait_wouldblock.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) 
	info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);

	res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);

	if (!res || errno != EWOULDBLOCK) {

		ksft_test_result_pass("futex_waitv returned: %d %s\n",

		ksft_test_result_fail("futex_waitv returned: %d %s\n",

				      res ? errno : res,

				      res ? strerror(errno) : "");

		ret = RET_FAIL;

tools/testing/selftests/mincore/mincore_selftest.c

+0 −3
Original line number Diff line number Diff line
@@ -261,9 +261,6 @@ TEST(check_file_mmap) 
		TH_LOG("No read-ahead pages found in memory");

	}



	EXPECT_LT(i, vec_size) {

		TH_LOG("Read-ahead pages reached the end of the file");

	}

	/*

	 * End of the readahead window. The rest of the pages shouldn't

	 * be in memory.

tools/testing/selftests/tpm2/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

AsyncTest.log

SpaceTest.log

tools/testing/selftests/tpm2/test_smoke.sh

+1 −1
Original line number Diff line number Diff line
@@ -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