diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2015-05-31 19:43:35 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2015-05-31 19:43:35 +0000 |
| commit | eddb85c663040c345d1d4e006665239080df21f6 (patch) | |
| tree | 9e37dbcafbd1018e9dc93ced7a763fe27933a6ce /tests | |
| parent | 73fe13044164a13c5e334c9216e359651e6786b9 (diff) | |
| download | src-eddb85c663040c345d1d4e006665239080df21f6.tar.gz src-eddb85c663040c345d1d4e006665239080df21f6.zip | |
Consistently only use one end of the pipe in the parent and debugger
processes and do not rely on EOF due to a close() in the debugger.
PR: 200489
Differential Revision: https://reviews.freebsd.org/D2674
Reviewed by: kib, ngie, rodrigc
Notes
Notes:
svn path=/head/; revision=283836
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/kern/ptrace_test.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 321dc828545d..b8d4fa235eab 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -304,7 +304,7 @@ ATF_TC_BODY(ptrace__parent_sees_exit_after_unrelated_debugger, tc) ATF_REQUIRE(write(dpipe[1], &c, sizeof(c)) == sizeof(c)); /* Wait for parent's failed wait. */ - ATF_REQUIRE(read(dpipe[1], &c, sizeof(c)) == 0); + ATF_REQUIRE(read(dpipe[1], &c, sizeof(c)) == sizeof(c)); wpid = waitpid(child, &status, 0); ATF_REQUIRE(wpid == child); @@ -313,6 +313,7 @@ ATF_TC_BODY(ptrace__parent_sees_exit_after_unrelated_debugger, tc) exit(0); } + close(dpipe[1]); /* Parent process. */ @@ -365,10 +366,11 @@ ATF_TC_BODY(ptrace__parent_sees_exit_after_unrelated_debugger, tc) ATF_REQUIRE(wpid == 0); /* Signal the debugger to wait for the child. */ - close(dpipe[0]); + ATF_REQUIRE(write(dpipe[0], &c, sizeof(c)) == sizeof(c)); /* Wait for the debugger. */ - ATF_REQUIRE(read(dpipe[1], &c, sizeof(c)) == 0); + ATF_REQUIRE(read(dpipe[0], &c, sizeof(c)) == 0); + close(dpipe[0]); /* The child process should now be ready. */ wpid = waitpid(child, &status, WNOHANG); |