testsuite: fix usage of reserved names
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.
diff --git a/testsuite/test-alias.c b/testsuite/test-alias.c
index 5e21573..4d1d8d3 100644
--- a/testsuite/test-alias.c
+++ b/testsuite/test-alias.c
@@ -64,7 +64,7 @@
},
.need_spawn = true,
.output = {
- .stdout = TESTSUITE_ROOTFS "test-alias/correct.txt",
+ .out = TESTSUITE_ROOTFS "test-alias/correct.txt",
});
static const struct test *tests[] = {
diff --git a/testsuite/test-loaded.c b/testsuite/test-loaded.c
index 33865cb..4b50813 100644
--- a/testsuite/test-loaded.c
+++ b/testsuite/test-loaded.c
@@ -85,7 +85,7 @@
},
.need_spawn = true,
.output = {
- .stdout = TESTSUITE_ROOTFS "test-loaded/correct.txt",
+ .out = TESTSUITE_ROOTFS "test-loaded/correct.txt",
});
static const struct test *tests[] = {
diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index c5934ea..e372310 100644
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -46,7 +46,7 @@
[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[] = {
diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index f0131e3..0ae03a6 100644
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -45,7 +45,7 @@
[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 @@
[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 @@
[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 @@
[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",
});
diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c
index 240480e..0892507 100644
--- a/testsuite/test-new-module.c
+++ b/testsuite/test-new-module.c
@@ -67,7 +67,7 @@
},
.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 @@
},
.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[] = {
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 6d85d7f..9877a64 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -223,7 +223,7 @@
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 @@
}
}
- 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 @@
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 @@
} 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 @@
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 @@
* 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 @@
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;
diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h
index 329d4a1..e4f3ecf 100644
--- a/testsuite/testsuite.h
+++ b/testsuite/testsuite.h
@@ -82,9 +82,9 @@
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