aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2017-03-30 19:46:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-30 19:46:26 +0000
commit2f185185b491c6ddb7e45eb5cc827b484597dd37 (patch)
treeec02e0e29aa1df5271064089d5a3421026458541
parenta30806fac718829c9744b6675e6583cbf2eaf5b4 (diff)
parent4ff932db9f95c7d0dccd82e372fba0176001df2f (diff)
downloadseccomp-tests-2f185185b491c6ddb7e45eb5cc827b484597dd37.tar.gz
Fix seccomp test on bullhead am: 9ec051c31f am: e602290af5
am: 4ff932db9f Change-Id: I67c6585716117d18630ee6ddc1d872501eab2402
-rw-r--r--linux/seccomp_bpf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/seccomp_bpf.c b/linux/seccomp_bpf.c
index 6f5b786..949ac25 100644
--- a/linux/seccomp_bpf.c
+++ b/linux/seccomp_bpf.c
@@ -1803,8 +1803,10 @@ TEST_F(TSYNC, siblings_fail_prctl)
/* Ensure diverging sibling failed to call prctl. */
pthread_join(self->sibling[0].tid, &status);
EXPECT_EQ(SIBLING_EXIT_FAILURE, (long)status);
+ self->sibling[0].tid = 0;
pthread_join(self->sibling[1].tid, &status);
EXPECT_EQ(SIBLING_EXIT_UNKILLED, (long)status);
+ self->sibling[1].tid = 0;
}
TEST_F(TSYNC, two_siblings_with_ancestor)