Skip to content

Commit 3b07108

Browse files
committed
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
2 parents a245882 + 197c1ea commit 3b07108

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

tools/testing/selftests/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ gpiogpio-hammer
44
gpioinclude/
55
gpiolsgpio
66
kselftest_install/
7-
tpm2/SpaceTest.log
87

98
# Python bytecode and cache
109
__pycache__/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
9898
info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);
9999
res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);
100100
if (!res || errno != EWOULDBLOCK) {
101-
ksft_test_result_pass("futex_waitv returned: %d %s\n",
101+
ksft_test_result_fail("futex_waitv returned: %d %s\n",
102102
res ? errno : res,
103103
res ? strerror(errno) : "");
104104
ret = RET_FAIL;

tools/testing/selftests/mincore/mincore_selftest.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,6 @@ TEST(check_file_mmap)
261261
TH_LOG("No read-ahead pages found in memory");
262262
}
263263

264-
EXPECT_LT(i, vec_size) {
265-
TH_LOG("Read-ahead pages reached the end of the file");
266-
}
267264
/*
268265
* End of the readahead window. The rest of the pages shouldn't
269266
* be in memory.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
AsyncTest.log
3+
SpaceTest.log

tools/testing/selftests/tpm2/test_smoke.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ ksft_skip=4
66

77
[ -e /dev/tpm0 ] || exit $ksft_skip
88
read tpm_version < /sys/class/tpm/tpm0/tpm_version_major
9-
[ "$tpm_version" == 2 ] || exit $ksft_skip
9+
[ "$tpm_version" = 2 ] || exit $ksft_skip
1010

1111
python3 -m unittest -v tpm2_tests.SmokeTest 2>&1

0 commit comments

Comments
 (0)