diff options
| author | Paul Lawrence <paullawrence@google.com> | 2017-03-28 15:20:49 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2017-03-30 15:21:52 -0700 |
| commit | fd35266681dbd1b5d992081c573227d5978aa5da (patch) | |
| tree | ec02e0e29aa1df5271064089d5a3421026458541 | |
| parent | a30806fac718829c9744b6675e6583cbf2eaf5b4 (diff) | |
| download | platform_external_seccomp-tests-android-cts-8.0_r23.tar.gz platform_external_seccomp-tests-android-cts-8.0_r23.tar.bz2 platform_external_seccomp-tests-android-cts-8.0_r23.zip | |
Fix seccomp test on bullheadandroid-wear-o-preview-4android-wear-o-preview-3android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-o-preview-4android-o-preview-3android-o-preview-2android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2
Note that this does not make the test pass (see other fix)
but does remove another libc error message
Test: Run on bullhead and sailfish - libc warning is now gone
Bug: 36656103
(cherry picked from commit 9ec051c31fd967c1b0ddcccb7e0cc2bcf61f90ca)
Change-Id: I37ea6350c344050119a01466c6215400b103de8c
| -rw-r--r-- | linux/seccomp_bpf.c | 2 |
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) |