| Message ID | aa092d10-f3d5-4714-98be-bd6fabd4225d@linuxfoundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] Kselftest fixes update for Linux 6.15-rc2 | expand |
The pull request you sent on Wed, 9 Apr 2025 16:13:39 -0600:
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.15-rc2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3b07108ada81a8ebcebf1fe61367b4e436c895bd
Thank you!
diff --git a/tools/testing/selftests/.gitignore b/tools/testing/selftests/.gitignore index cb24124ac5b9..674aaa02e396 100644 --- a/tools/testing/selftests/.gitignore +++ b/tools/testing/selftests/.gitignore @@ -4,7 +4,6 @@ gpiogpio-hammer gpioinclude/ gpiolsgpio kselftest_install/ -tpm2/SpaceTest.log # Python bytecode and cache __pycache__/ diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c index 7d7a6a06cdb7..2d8230da9064 100644 --- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c +++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c @@ -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; diff --git a/tools/testing/selftests/mincore/mincore_selftest.c b/tools/testing/selftests/mincore/mincore_selftest.c index e949a43a6145..efabfcbe0b49 100644 --- a/tools/testing/selftests/mincore/mincore_selftest.c +++ b/tools/testing/selftests/mincore/mincore_selftest.c @@ -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. diff --git a/tools/testing/selftests/tpm2/.gitignore b/tools/testing/selftests/tpm2/.gitignore new file mode 100644 index 000000000000..6d6165c5e35d --- /dev/null +++ b/tools/testing/selftests/tpm2/.gitignore @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +AsyncTest.log +SpaceTest.log 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
Hi Linus, Please pull the following kselftest fixes update for Linux 6.15-rc2 Fixes tpm2, futex, and mincore tests. Creates a dedicated .gitignore for tpm2 Details: selftests: tpm2: test_smoke: use POSIX-conformant expression operator selftests/futex: futex_waitv wouldblock test should fail selftests: tpm2: create a dedicated .gitignore selftests/mincore: Allow read-ahead pages to reach the end of the file diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 0af2f6be1b4281385b618cb86ad946eded089ac8: Linux 6.15-rc1 (2025-04-06 13:11:33 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.15-rc2 for you to fetch changes up to 197c1eaa7ba633a482ed7588eea6fd4aa57e08d4: selftests/mincore: Allow read-ahead pages to reach the end of the file (2025-04-08 17:08:50 -0600) ---------------------------------------------------------------- linux_kselftest-fixes-6.15-rc2 Fixes tpm2, futex, and mincore tests. Creates a dedicated .gitignore for tpm2 Details: selftests: tpm2: test_smoke: use POSIX-conformant expression operator selftests/futex: futex_waitv wouldblock test should fail selftests: tpm2: create a dedicated .gitignore selftests/mincore: Allow read-ahead pages to reach the end of the file ---------------------------------------------------------------- Ahmed Salem (1): selftests: tpm2: test_smoke: use POSIX-conformant expression operator Edward Liaw (1): selftests/futex: futex_waitv wouldblock test should fail Khaled Elnaggar (1): selftests: tpm2: create a dedicated .gitignore Qiuxu Zhuo (1): selftests/mincore: Allow read-ahead pages to reach the end of the file tools/testing/selftests/.gitignore | 1 - tools/testing/selftests/futex/functional/futex_wait_wouldblock.c | 2 +- tools/testing/selftests/mincore/mincore_selftest.c | 3 --- tools/testing/selftests/tpm2/.gitignore | 3 +++ tools/testing/selftests/tpm2/test_smoke.sh | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 tools/testing/selftests/tpm2/.gitignore ----------------------------------------------------------------