[LTP] [PATCH 22/31] sock*: Remove UCLINUX

Petr Vorel
2024-04-11T14:36:17Z

testcases/kernel/syscalls/socketpair/socketpair01.c | 2 --
testcases/kernel/syscalls/sockioctl/sockioctl01.c | 2 --
2 files changed, 4 deletions(-)

diff --git a/testcases/kernel/syscalls/socketpair/socketpair01.c b/testcases/kernel/syscalls/socketpair/socketpair01.c
index 675eb535d..5d9610b12 100644
--- a/testcases/kernel/syscalls/socketpair/socketpair01.c
+++ b/testcases/kernel/syscalls/socketpair/socketpair01.c
@@ -34,10 +34,8 @@ struct test_case_t {
{PF_INET, 75, 0, fds, -1, EINVAL, "invalid type"},
{PF_UNIX, SOCK_DGRAM, 0, fds, 0, 0, "UNIX domain dgram"},
{PF_INET, SOCK_RAW, 0, fds, -1, EPROTONOSUPPORT, "raw open as non-root"},
-#ifndef UCLINUX
{PF_UNIX, SOCK_STREAM, 0, 0, -1, EFAULT, "bad aligned pointer"},
{PF_UNIX, SOCK_STREAM, 0, (int *)7, -1, EFAULT, "bad unaligned pointer"},
-#endif
{PF_INET, SOCK_DGRAM, 17, fds, -1, EOPNOTSUPP, "UDP socket"},
{PF_INET, SOCK_DGRAM, 6, fds, -1, EPROTONOSUPPORT, "TCP dgram"},
{PF_INET, SOCK_STREAM, 6, fds, -1, EOPNOTSUPP, "TCP socket"},
diff --git a/testcases/kernel/syscalls/sockioctl/sockioctl01.c b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
index ff3738f32..e81ec20a5 100644
--- a/testcases/kernel/syscalls/sockioctl/sockioctl01.c
+++ b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
@@ -87,13 +87,11 @@ struct test_case_t {
(struct sockaddr *)&fsin1, sizeof(fsin1), -1,
EINVAL, setup0, cleanup0, "not a socket"}
,
-#if !defined(UCLINUX)
{
PF_INET, SOCK_STREAM, 0, SIOCATMARK, 0,
(struct sockaddr *)&fsin1, sizeof(fsin1), -1,
EFAULT, setup1, cleanup1, "invalid option buffer"}
,
-#endif
{
PF_INET, SOCK_DGRAM, 0, SIOCATMARK, &optval,
(struct sockaddr *)&fsin1, sizeof(fsin1), -1,