* [lttng-dev] [PATCH lttng-tools] Tests fix: Missing waitpid in fork test
@ 2014-02-26 15:56 Jérémie Galarneau
2014-02-26 18:38 ` David Goulet
0 siblings, 1 reply; 2+ messages in thread
From: Jérémie Galarneau @ 2014-02-26 15:56 UTC (permalink / raw)
Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
tests/regression/ust/fork/fork.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tests/regression/ust/fork/fork.c b/tests/regression/ust/fork/fork.c
index 744e920..7df982b 100644
--- a/tests/regression/ust/fork/fork.c
+++ b/tests/regression/ust/fork/fork.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <stdlib.h>
#define TRACEPOINT_DEFINE
@@ -51,12 +52,19 @@ int main(int argc, char **argv, char *env[])
result = execve(argv[1], args, env);
if (result == -1) {
perror("execve");
- return 1;
+ result = 1;
+ goto end;
}
} else {
printf("child_pid %d\n", result);
tracepoint(ust_tests_fork, after_fork_parent, getpid());
+ if (waitpid(result, NULL, 0) < 0) {
+ perror("waitpid");
+ result = 1;
+ goto end;
+ }
}
-
- return 0;
+ result = 0;
+end:
+ return result;
}
--
1.9.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [lttng-dev] [PATCH lttng-tools] Tests fix: Missing waitpid in fork test
2014-02-26 15:56 [lttng-dev] [PATCH lttng-tools] Tests fix: Missing waitpid in fork test Jérémie Galarneau
@ 2014-02-26 18:38 ` David Goulet
0 siblings, 0 replies; 2+ messages in thread
From: David Goulet @ 2014-02-26 18:38 UTC (permalink / raw)
Merged!
On 26 Feb (10:56:57), J?r?mie Galarneau wrote:
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
> tests/regression/ust/fork/fork.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/tests/regression/ust/fork/fork.c b/tests/regression/ust/fork/fork.c
> index 744e920..7df982b 100644
> --- a/tests/regression/ust/fork/fork.c
> +++ b/tests/regression/ust/fork/fork.c
> @@ -20,6 +20,7 @@
> #include <stdio.h>
> #include <unistd.h>
> #include <sys/types.h>
> +#include <sys/wait.h>
> #include <stdlib.h>
>
> #define TRACEPOINT_DEFINE
> @@ -51,12 +52,19 @@ int main(int argc, char **argv, char *env[])
> result = execve(argv[1], args, env);
> if (result == -1) {
> perror("execve");
> - return 1;
> + result = 1;
> + goto end;
> }
> } else {
> printf("child_pid %d\n", result);
> tracepoint(ust_tests_fork, after_fork_parent, getpid());
> + if (waitpid(result, NULL, 0) < 0) {
> + perror("waitpid");
> + result = 1;
> + goto end;
> + }
> }
> -
> - return 0;
> + result = 0;
> +end:
> + return result;
> }
> --
> 1.9.0
>
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140226/aade80c9/attachment.pgp>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-26 18:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-26 15:56 [lttng-dev] [PATCH lttng-tools] Tests fix: Missing waitpid in fork test Jérémie Galarneau
2014-02-26 18:38 ` David Goulet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox