Skip to content

Commit e3e3d02

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

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

testcases/kernel/syscalls/recv/recv01.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ struct test_case_t { /* test case structure */
8787
0, 0, 0, buf, sizeof(buf), 0,
8888
-1, ENOTSOCK, setup0, cleanup0, "invalid socket"}
8989
,
90-
#ifndef UCLINUX
91-
/* Skip since uClinux does not implement memory protection */
9290
{
9391
PF_INET, SOCK_STREAM, 0, (void *)-1, sizeof(buf), 0,
9492
-1, EFAULT, setup1, cleanup1, "invalid recv buffer"}
9593
,
96-
#endif
9794
{
9895
PF_INET, SOCK_STREAM, 0, buf, sizeof(buf), MSG_OOB,
9996
-1, EINVAL, setup1, cleanup1, "invalid MSG_OOB flag set"}
@@ -105,19 +102,11 @@ struct test_case_t { /* test case structure */
105102

106103
int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
107104

108-
#ifdef UCLINUX
109-
static char *argv0;
110-
#endif
111-
112105
int main(int argc, char *argv[])
113106
{
114107
int lc;
115108

116109
tst_parse_opts(argc, argv, NULL, NULL);
117-
#ifdef UCLINUX
118-
argv0 = argv[0];
119-
maybe_run_child(&do_child, "d", &sfd);
120-
#endif
121110

122111
setup();
123112

@@ -242,13 +231,7 @@ pid_t start_server(struct sockaddr_in *sin0)
242231

243232
switch ((pid = tst_fork())) {
244233
case 0: /* child */
245-
#ifdef UCLINUX
246-
if (self_exec(argv0, "d", sfd) < 0)
247-
tst_brkm(TBROK | TERRNO, cleanup,
248-
"server self_exec failed");
249-
#else
250234
do_child();
251-
#endif
252235
break;
253236
case -1:
254237
tst_brkm(TBROK | TERRNO, cleanup, "server fork failed");

testcases/kernel/syscalls/recvfrom/recvfrom01.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,12 @@ struct test_case_t { /* test case structure */
126126

127127
int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
128128

129-
#ifdef UCLINUX
130-
static char *argv0;
131-
#endif
132-
133129
int main(int argc, char *argv[])
134130
{
135131
int lc;
136132

137133
tst_parse_opts(argc, argv, NULL, NULL);
138134

139-
#ifdef UCLINUX
140-
argv0 = argv[0];
141-
maybe_run_child(&do_child, "d", &sfd);
142-
#endif
143-
144135
setup();
145136

146137
for (lc = 0; TEST_LOOPING(lc); ++lc) {
@@ -271,13 +262,7 @@ pid_t start_server(struct sockaddr_in *sin0)
271262

272263
switch ((pid = tst_fork())) {
273264
case 0: /* child */
274-
#ifdef UCLINUX
275-
if (self_exec(argv0, "d", sfd) < 0) {
276-
tst_brkm(TBROK, cleanup, "server self_exec failed");
277-
}
278-
#else
279265
do_child();
280-
#endif
281266
break;
282267
case -1:
283268
tst_brkm(TBROK | TERRNO, cleanup, "server fork failed");

0 commit comments

Comments
 (0)