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

am e760a1eb: am 17976019: Merge "Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test."

Browse Source 
* commit 'e760a1eb30804df478640b2176fc798ab6e7db9b':
  Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test.
This commit is contained in:
Yabin Cui
2015-02-05 18:47:06 +00:00
committed by Android Git Automerger
parent 0abb17dd29 e760a1eb30
commit c249e7d6c9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/fortify_test.cpp
View File

@@ -26,6 +26,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <time.h>
#if __BIONIC__ #if __BIONIC__
#define ASSERT_FORTIFY(expr) ASSERT_EXIT(expr, testing::KilledBySignal(SIGABRT), "FORTIFY") #define ASSERT_FORTIFY(expr) ASSERT_EXIT(expr, testing::KilledBySignal(SIGABRT), "FORTIFY")
@@ -938,11 +939,15 @@ TEST(TEST_NAME, s_n_printf_macro_expansion) {
TEST_F(DEATHTEST, poll_fortified) { TEST_F(DEATHTEST, poll_fortified) {
nfds_t fd_count = atoi("2"); // suppress compiler optimizations nfds_t fd_count = atoi("2"); // suppress compiler optimizations
pollfd buf[1] = {{0, POLLIN, 0}}; pollfd buf[1] = {{0, POLLIN, 0}};
ASSERT_FORTIFY(poll(buf, fd_count, -1)); // Set timeout to zero to prevent waiting in poll when fortify test fails.
ASSERT_FORTIFY(poll(buf, fd_count, 0));
} }
TEST_F(DEATHTEST, ppoll_fortified) { TEST_F(DEATHTEST, ppoll_fortified) {
nfds_t fd_count = atoi("2"); // suppress compiler optimizations nfds_t fd_count = atoi("2"); // suppress compiler optimizations
pollfd buf[1] = {{0, POLLIN, 0}}; pollfd buf[1] = {{0, POLLIN, 0}};
ASSERT_FORTIFY(ppoll(buf, fd_count, NULL, NULL)); // Set timeout to zero to prevent waiting in ppoll when fortify test fails.
timespec timeout;
timeout.tv_sec = timeout.tv_nsec = 0;
ASSERT_FORTIFY(ppoll(buf, fd_count, &timeout, NULL));
} }