Merge "Convert new tests to GTEST_SKIP."
am: e7ee0731c3
Change-Id: Icb868f196313b5fa45f9e42c7c1a6533677c50f3
This commit is contained in:
commit
94cd62ccd1
1 changed files with 6 additions and 6 deletions
|
@ -728,7 +728,7 @@ TEST(android_mallopt, set_allocation_limit) {
|
||||||
testing::ExitedWithCode(0), "");
|
testing::ExitedWithCode(0), "");
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -740,7 +740,7 @@ TEST(android_mallopt, set_allocation_limit_multiple) {
|
||||||
limit = 32 * 1024 * 1024;
|
limit = 32 * 1024 * 1024;
|
||||||
ASSERT_FALSE(android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES, &limit, sizeof(limit)));
|
ASSERT_FALSE(android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES, &limit, sizeof(limit)));
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -805,7 +805,7 @@ TEST(android_mallopt, set_allocation_limit_realloc_increase) {
|
||||||
|
|
||||||
VerifyMaxPointers(max_pointers);
|
VerifyMaxPointers(max_pointers);
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -833,7 +833,7 @@ TEST(android_mallopt, set_allocation_limit_realloc_decrease) {
|
||||||
|
|
||||||
VerifyMaxPointers(max_pointers);
|
VerifyMaxPointers(max_pointers);
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -853,7 +853,7 @@ TEST(android_mallopt, set_allocation_limit_realloc_free) {
|
||||||
|
|
||||||
VerifyMaxPointers(max_pointers);
|
VerifyMaxPointers(max_pointers);
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -915,6 +915,6 @@ TEST(android_mallopt, set_allocation_limit_multiple_threads) {
|
||||||
ASSERT_EQ(0, WEXITSTATUS(status));
|
ASSERT_EQ(0, WEXITSTATUS(status));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
|
GTEST_SKIP() << "bionic extension";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue