Skip to content

Commit 9b02fce

Browse files
pevikmetan-ucw
authored andcommitted
syscalls/send*: Remove UCLINUX
Signed-off-by: Petr Vorel <[email protected]> Reviewed-by: Cyril Hrubis <[email protected]>
1 parent e3e3d02 commit 9b02fce

File tree

3 files changed

+0
-56
lines changed

3 files changed

+0
-56
lines changed

testcases/kernel/syscalls/send/send01.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ static struct test_case_t tdat[] = {
100100
.cleanup = cleanup0,
101101
.desc = "invalid socket"}
102102
,
103-
#ifndef UCLINUX
104-
/* Skip since uClinux does not implement memory protection */
105103
{.domain = PF_INET,
106104
.type = SOCK_STREAM,
107105
.proto = 0,
@@ -114,7 +112,6 @@ static struct test_case_t tdat[] = {
114112
.cleanup = cleanup1,
115113
.desc = "invalid send buffer"}
116114
,
117-
#endif
118115
{.domain = PF_INET,
119116
.type = SOCK_DGRAM,
120117
.proto = 0,
@@ -139,8 +136,6 @@ static struct test_case_t tdat[] = {
139136
.cleanup = cleanup1,
140137
.desc = "local endpoint shutdown"}
141138
,
142-
#ifndef UCLINUX
143-
/* Skip since uClinux does not implement memory protection */
144139
{.domain = PF_INET,
145140
.type = SOCK_DGRAM,
146141
.proto = 0,
@@ -152,15 +147,10 @@ static struct test_case_t tdat[] = {
152147
.setup = setup1,
153148
.cleanup = cleanup1,
154149
.desc = "invalid flags set"}
155-
#endif
156150
};
157151

158152
int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
159153

160-
#ifdef UCLINUX
161-
static char *argv0;
162-
#endif
163-
164154
static pid_t start_server(struct sockaddr_in *sin0)
165155
{
166156
pid_t pid;
@@ -187,13 +177,7 @@ static pid_t start_server(struct sockaddr_in *sin0)
187177

188178
switch ((pid = tst_fork())) {
189179
case 0:
190-
#ifdef UCLINUX
191-
if (self_exec(argv0, "d", sfd) < 0)
192-
tst_brkm(TBROK | TERRNO, cleanup,
193-
"server self_exec failed");
194-
#else
195180
do_child();
196-
#endif
197181
break;
198182
case -1:
199183
tst_brkm(TBROK | TERRNO, cleanup, "server fork failed");
@@ -253,11 +237,6 @@ int main(int ac, char *av[])
253237

254238
tst_parse_opts(ac, av, NULL, NULL);
255239

256-
#ifdef UCLINUX
257-
argv0 = av[0];
258-
maybe_run_child(&do_child, "d", &sfd);
259-
#endif
260-
261240
setup();
262241

263242
for (lc = 0; TEST_LOOPING(lc); ++lc) {

testcases/kernel/syscalls/sendmsg/sendmsg01.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -358,21 +358,12 @@ struct test_case_t tdat[] = {
358358

359359
int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
360360

361-
#ifdef UCLINUX
362-
static char *argv0;
363-
#endif
364-
365361
int main(int argc, char *argv[])
366362
{
367363
int lc;
368364

369365
tst_parse_opts(argc, argv, NULL, NULL);
370366

371-
#ifdef UCLINUX
372-
argv0 = argv[0];
373-
maybe_run_child(&do_child, "dd", &sfd, &ufd);
374-
#endif
375-
376367
setup();
377368

378369
for (lc = 0; TEST_LOOPING(lc); ++lc) {
@@ -459,12 +450,7 @@ static pid_t start_server(struct sockaddr_in *sin0, struct sockaddr_un *sun0)
459450

460451
switch ((pid = tst_fork())) {
461452
case 0:
462-
#ifdef UCLINUX
463-
if (self_exec(argv0, "dd", sfd, ufd) < 0)
464-
tst_brkm(TBROK, cleanup, "server self_exec failed");
465-
#else
466453
do_child();
467-
#endif
468454
break;
469455
case -1:
470456
tst_brkm(TBROK, cleanup, "server fork failed: %s",

testcases/kernel/syscalls/sendto/sendto01.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ struct test_case_t tdat[] = {
106106
.cleanup = cleanup0,
107107
.desc = "invalid socket"}
108108
,
109-
#ifndef UCLINUX
110-
/* Skip since uClinux does not implement memory protection */
111109
{.domain = PF_INET,
112110
.type = SOCK_DGRAM,
113111
.proto = 0,
@@ -122,7 +120,6 @@ struct test_case_t tdat[] = {
122120
.cleanup = cleanup1,
123121
.desc = "invalid send buffer"}
124122
,
125-
#endif
126123
{.domain = PF_INET,
127124
.type = SOCK_STREAM,
128125
.proto = 0,
@@ -165,8 +162,6 @@ struct test_case_t tdat[] = {
165162
.cleanup = cleanup1,
166163
.desc = "invalid to buffer length"}
167164
,
168-
#ifndef UCLINUX
169-
/* Skip since uClinux does not implement memory protection */
170165
{.domain = PF_INET,
171166
.type = SOCK_DGRAM,
172167
.proto = 0,
@@ -181,7 +176,6 @@ struct test_case_t tdat[] = {
181176
.cleanup = cleanup1,
182177
.desc = "invalid to buffer"}
183178
,
184-
#endif
185179
{.domain = PF_INET,
186180
.type = SOCK_DGRAM,
187181
.proto = 0,
@@ -227,10 +221,6 @@ struct test_case_t tdat[] = {
227221

228222
int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
229223

230-
#ifdef UCLINUX
231-
static char *argv0;
232-
#endif
233-
234224
static pid_t start_server(struct sockaddr_in *sin0)
235225
{
236226
pid_t pid;
@@ -257,13 +247,7 @@ static pid_t start_server(struct sockaddr_in *sin0)
257247

258248
switch ((pid = tst_fork())) {
259249
case 0:
260-
#ifdef UCLINUX
261-
if (self_exec(argv0, "d", sfd) < 0)
262-
tst_brkm(TBROK | TERRNO, cleanup,
263-
"server self_exec failed");
264-
#else
265250
do_child();
266-
#endif
267251
break;
268252
case -1:
269253
tst_brkm(TBROK | TERRNO, cleanup, "server fork failed");
@@ -323,11 +307,6 @@ int main(int ac, char *av[])
323307

324308
tst_parse_opts(ac, av, NULL, NULL);
325309

326-
#ifdef UCLINUX
327-
argv0 = av[0];
328-
maybe_run_child(&do_child, "d", &sfd);
329-
#endif
330-
331310
setup();
332311

333312
for (lc = 0; TEST_LOOPING(lc); ++lc) {

0 commit comments

Comments
 (0)