generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c07f7ee7: am a847073a: Merge "Rename test_forked -> test_isolated"

Browse Source 
* commit 'c07f7ee70daa04aa5d77771d8859592d110a7177':
  Rename test_forked -> test_isolated
This commit is contained in:
Dmitriy Ivanov 2014-11-21 16:11:18 +00:00 committed by Android Git Automerger
commit 6854b511f2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/gtest_ex.h
View File

@ -16,8 +16,15 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
template<typename F> template<typename F>
void test_forked(F test) { void test_isolated(F test) {
int pid = fork(); int pid = fork();
ASSERT_NE(-1, pid) << strerror(errno); ASSERT_NE(-1, pid) << strerror(errno);

2
tests/pthread_test.cpp
View File

@ -723,7 +723,7 @@ static void AtForkChild1() { g_atfork_child_calls = (g_atfork_child_calls << 4)
static void AtForkChild2() { g_atfork_child_calls = (g_atfork_child_calls << 4) | 2; } static void AtForkChild2() { g_atfork_child_calls = (g_atfork_child_calls << 4) | 2; }
TEST(pthread, pthread_atfork_smoke) { TEST(pthread, pthread_atfork_smoke) {
test_forked([]() { test_isolated([] {
ASSERT_EQ(0, pthread_atfork(AtForkPrepare1, AtForkParent1, AtForkChild1)); ASSERT_EQ(0, pthread_atfork(AtForkPrepare1, AtForkParent1, AtForkChild1));
ASSERT_EQ(0, pthread_atfork(AtForkPrepare2, AtForkParent2, AtForkChild2)); ASSERT_EQ(0, pthread_atfork(AtForkPrepare2, AtForkParent2, AtForkChild2));