selftests/core: fix close_range_test build after XFAIL removal
PATCH 1/1 selftests/core: fix close_range_test build after XFAIL removal
XFAIL was removed in commit 9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP") and its use in close_range_test was already replaced by commit 1d44d0dd61b6 ("selftests: core: use SKIP instead of XFAIL in close_range_test.c"). However, commit 23afeaeff3d9 ("selftests: core:
add tests for CLOSE_RANGE_CLOEXEC") introduced usage of XFAIL in TEST(close_range_cloexec). Use SKIP there as well.
--- tools/testing/selftests/core/close_range_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/core/close_range_test.c +3 -3
@@ -241,7 +241,7 @@ TEST(close_range_cloexec) fd =open ("/dev/null" ,O_RDONLY ); ASSERT_GE(fd, 0) {if (errno ==ENOENT ) -XFAIL (return,"Skipping test since /dev/null does not exist" ); +SKIP (return,"Skipping test since /dev/null does not exist" ); } open_fds[i] = fd;
@@ -250,9 +250,9 @@ TEST(close_range_cloexec) ret =sys_close_range (1000 ,1000 ,CLOSE_RANGE_CLOEXEC );if (ret <0 ) {if (errno ==ENOSYS ) -XFAIL (return,"close_range() syscall not supported" ); +SKIP (return,"close_range() syscall not supported" );if (errno ==EINVAL ) -XFAIL (return,"close_range() doesn't support CLOSE_RANGE_CLOEXEC" ); +SKIP (return,"close_range() doesn't support CLOSE_RANGE_CLOEXEC" ); }/* Ensure the FD_CLOEXEC bit is set also with a resource limit in place. */
Signature · 1 line
2.29.0
Quoted 11 lines · Tobias Klauser
XFAIL was removed in commit
9847d24af95c("selftests/harness: Refactor XFAIL into SKIP") and its use inclose_range_testwas already replaced by commit1d44d0dd61b6("selftests: core: use SKIP instead of XFAIL inclose_range_test.c"). However, commit23afeaeff3d9("selftests: core:
add tests forCLOSE_RANGE_CLOEXEC") introduced usage of XFAIL inTEST(close_range_cloexec). Use SKIP there as well.Cc Giuseppe Scrivano <[email protected]>Fixes 23afeaeff3d9 ("selftests: core: add tests for CLOSE_RANGE_CLOEXEC")Signed-off-by Tobias Klauser <[email protected]>---
Thanks for this! I already have a fix for this in my tree but I'm dropping it and taking yours instead.
Shuah, I'll be taking this through my tree since I'm adding selftests for a vfs regression fix that I'll be sending before Sunday.
Christian
Shuah Khan
maintainerQuoted 16 lines · Christian Brauner
Quoted 11 lines · Tobias Klauser
XFAIL was removed in commit
9847d24af95c("selftests/harness: Refactor XFAIL into SKIP") and its use inclose_range_testwas already replaced by commit1d44d0dd61b6("selftests: core: use SKIP instead of XFAIL inclose_range_test.c"). However, commit23afeaeff3d9("selftests: core:
add tests forCLOSE_RANGE_CLOEXEC") introduced usage of XFAIL inTEST(close_range_cloexec). Use SKIP there as well.Cc Giuseppe Scrivano <[email protected]>Fixes 23afeaeff3d9 ("selftests: core: add tests for CLOSE_RANGE_CLOEXEC")Signed-off-by Tobias Klauser <[email protected]>---
Thanks for this! I already have a fix for this in my tree but I'm dropping it and taking yours instead.
Quoted 7 lines
Shuah, I'll be taking this through my tree since I'm adding selftests for a vfs regression fix that I'll be sending before Sunday.
Christian
Thank you Christian
thanks,
-- Shuah