tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '17976019a13a94ae428849bfe297f8e531f95013':
  Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test.
This commit is contained in:
Yabin Cui 2015-02-05 02:30:46 +00:00 committed by Android Git Automerger
commit e760a1eb30
1 changed files with 7 additions and 2 deletions
Show stats 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/stat.h>
#include <sys/types.h>
#include <time.h>
#if __BIONIC__
#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) {
nfds_t fd_count = atoi("2"); // suppress compiler optimizations
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) {
nfds_t fd_count = atoi("2"); // suppress compiler optimizations
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));
}