AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-24 07:20:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

testsuite: fix usage of reserved names

Browse Source 
stdout and stderr are names reserved for the implementation
and musl uses them rightfully as macro - and the expansion
causes (of course) unexpected results.

rename the struct members stdout to out and stderr
to err, to be 1) compliant 2) cause compilation to
succeed.

fixes build with musl libc.
This commit is contained in:
John Spencer 2013-08-27 01:38:11 +02:00 committed by Lucas De Marchi
parent 18811d22e9
commit bd4e7340bc
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/test-alias.c
View File

@ -64,7 +64,7 @@ static DEFINE_TEST(alias_1,
},
.need_spawn = true,
.output = {
.stdout = TESTSUITE_ROOTFS "test-alias/correct.txt",
.out = TESTSUITE_ROOTFS "test-alias/correct.txt",
});
static const struct test *tests[] = {

2
testsuite/test-loaded.c
View File

@ -85,7 +85,7 @@ static DEFINE_TEST(loaded_1,
},
.need_spawn = true,
.output = {
.stdout = TESTSUITE_ROOTFS "test-loaded/correct.txt",
.out = TESTSUITE_ROOTFS "test-loaded/correct.txt",
});
static const struct test *tests[] = {

2
testsuite/test-modinfo.c
View File

@ -46,7 +46,7 @@ static DEFINE_TEST(modinfo_jonsmodules,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/",
},
.output = {
.stdout = TESTSUITE_ROOTFS "test-modinfo/correct.txt",
.out = TESTSUITE_ROOTFS "test-modinfo/correct.txt",
});
static const struct test *tests[] = {

8
testsuite/test-modprobe.c
View File

@ -45,7 +45,7 @@ static DEFINE_TEST(modprobe_show_depends,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/show-depends",
},
.output = {
.stdout = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct.txt",
});
static __noreturn int modprobe_show_depends2(const struct test *t)
@ -67,7 +67,7 @@ static DEFINE_TEST(modprobe_show_depends2,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/show-depends",
},
.output = {
.stdout = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-psmouse.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-psmouse.txt",
});
@ -90,7 +90,7 @@ static DEFINE_TEST(modprobe_show_alias_to_none,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/alias-to-none",
},
.output = {
.stdout = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-psmouse.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-psmouse.txt",
});
@ -177,7 +177,7 @@ static DEFINE_TEST(modprobe_param_kcmdline,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline",
},
.output = {
.stdout = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline/correct.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline/correct.txt",
});

4
testsuite/test-new-module.c
View File

@ -67,7 +67,7 @@ static DEFINE_TEST(from_name,
},
.need_spawn = true,
.output = {
.stdout = TESTSUITE_ROOTFS "test-new-module/from_name/correct.txt",
.out = TESTSUITE_ROOTFS "test-new-module/from_name/correct.txt",
});
static int from_alias(const struct test *t)
@ -112,7 +112,7 @@ static DEFINE_TEST(from_alias,
},
.need_spawn = true,
.output = {
.stdout = TESTSUITE_ROOTFS "test-new-module/from_alias/correct.txt",
.out = TESTSUITE_ROOTFS "test-new-module/from_alias/correct.txt",
});
static const struct test *tests[] = {

30
testsuite/testsuite.c
View File

@ -223,7 +223,7 @@ static inline int test_run_child(const struct test *t, int fdout[2],
test_export_environ(t);
/* Close read-fds and redirect std{out,err} to the write-fds */
if (t->output.stdout != NULL) {
if (t->output.out != NULL) {
close(fdout[0]);
if (dup2(fdout[1], STDOUT_FILENO) < 0) {
ERR("could not redirect stdout to pipe: %m\n");
@ -231,10 +231,10 @@ static inline int test_run_child(const struct test *t, int fdout[2],
}
}
if (t->output.stderr != NULL) {
if (t->output.err != NULL) {
close(fderr[0]);
if (dup2(fderr[1], STDERR_FILENO) < 0) {
ERR("could not redirect stdout to pipe: %m\n");
ERR("could not redirect stderr to pipe: %m\n");
exit(EXIT_FAILURE);
}
}
@ -282,12 +282,12 @@ static inline bool test_run_parent_check_outputs(const struct test *t,
return false;
}
if (t->output.stdout != NULL) {
fd_matchout = open(t->output.stdout, O_RDONLY);
if (t->output.out != NULL) {
fd_matchout = open(t->output.out, O_RDONLY);
if (fd_matchout < 0) {
err = -errno;
ERR("could not open %s for read: %m\n",
t->output.stdout);
t->output.out);
goto out;
}
memset(&ep_outpipe, 0, sizeof(struct epoll_event));
@ -301,12 +301,12 @@ static inline bool test_run_parent_check_outputs(const struct test *t,
} else
fdout = -1;
if (t->output.stderr != NULL) {
fd_matcherr = open(t->output.stderr, O_RDONLY);
if (t->output.err != NULL) {
fd_matcherr = open(t->output.err, O_RDONLY);
if (fd_matcherr < 0) {
err = -errno;
ERR("could not open %s for read: %m\n",
t->output.stderr);
t->output.err);
goto out;
}
@ -536,9 +536,9 @@ static inline int test_run_parent(const struct test *t, int fdout[2],
bool matchout;
/* Close write-fds */
if (t->output.stdout != NULL)
if (t->output.out != NULL)
close(fdout[1]);
if (t->output.stderr != NULL)
if (t->output.err != NULL)
close(fderr[1]);
close(fdmonitor[1]);
@ -549,9 +549,9 @@ static inline int test_run_parent(const struct test *t, int fdout[2],
* break pipe on the other end: either child already closed or we want
* to stop it
*/
if (t->output.stdout != NULL)
if (t->output.out != NULL)
close(fdout[0]);
if (t->output.stderr != NULL)
if (t->output.err != NULL)
close(fderr[0]);
close(fdmonitor[0]);
@ -650,14 +650,14 @@ int test_run(const struct test *t)
if (t->need_spawn && oneshot)
test_run_spawned(t);
if (t->output.stdout != NULL) {
if (t->output.out != NULL) {
if (pipe(fdout) != 0) {
ERR("could not create out pipe for %s\n", t->name);
return EXIT_FAILURE;
}
}
if (t->output.stderr != NULL) {
if (t->output.err != NULL) {
if (pipe(fderr) != 0) {
ERR("could not create err pipe for %s\n", t->name);
return EXIT_FAILURE;

4
testsuite/testsuite.h
View File

@ -82,9 +82,9 @@ struct test {
const char *description;
struct {
/* File with correct stdout */
const char *stdout;
const char *out;
/* File with correct stderr */
const char *stderr;
const char *err;
/*
* Vector with pair of files