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

am c74a7680: Merge "Fix mips signed/unsigned signal_test.cpp build breakage."

Browse Source 
* commit 'c74a7680a409cd9f0cd3847b59e20ac16ad05806':
  Fix mips signed/unsigned signal_test.cpp build breakage.
This commit is contained in:
Elliott Hughes
2014-09-04 23:22:50 +00:00
committed by Android Git Automerger
parent 4effe38ae6 c74a7680a4
commit fc8f246a49
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/signal_test.cpp
View File

@@ -202,7 +202,7 @@ TEST(signal, sigaction) {
// arm64, x86, and x86-64. The version of glibc we're using also doesn't // arm64, x86, and x86-64. The version of glibc we're using also doesn't
// define SA_RESTORER, but luckily it's the same value everywhere, and mips // define SA_RESTORER, but luckily it's the same value everywhere, and mips
// doesn't use the bit for anything. // doesn't use the bit for anything.
static const int sa_restorer = 0x4000000; static const unsigned sa_restorer = 0x4000000;
// See what's currently set for SIGALRM. // See what's currently set for SIGALRM.
struct sigaction original_sa; struct sigaction original_sa;
@@ -210,7 +210,7 @@ TEST(signal, sigaction) {
ASSERT_EQ(0, sigaction(SIGALRM, NULL, &original_sa)); ASSERT_EQ(0, sigaction(SIGALRM, NULL, &original_sa));
ASSERT_TRUE(original_sa.sa_handler == NULL); ASSERT_TRUE(original_sa.sa_handler == NULL);
ASSERT_TRUE(original_sa.sa_sigaction == NULL); ASSERT_TRUE(original_sa.sa_sigaction == NULL);
ASSERT_EQ(0, original_sa.sa_flags & ~sa_restorer); ASSERT_EQ(0U, original_sa.sa_flags & ~sa_restorer);
// Set a traditional sa_handler signal handler. // Set a traditional sa_handler signal handler.
struct sigaction sa; struct sigaction sa;
@@ -225,7 +225,7 @@ TEST(signal, sigaction) {
ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa)); ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa));
ASSERT_TRUE(sa.sa_handler == EmptySignalHandler); ASSERT_TRUE(sa.sa_handler == EmptySignalHandler);
ASSERT_TRUE((void*) sa.sa_sigaction == (void*) sa.sa_handler); ASSERT_TRUE((void*) sa.sa_sigaction == (void*) sa.sa_handler);
ASSERT_EQ(SA_ONSTACK, sa.sa_flags & ~sa_restorer); ASSERT_EQ(static_cast<unsigned>(SA_ONSTACK), sa.sa_flags & ~sa_restorer);
// Set a new-style sa_sigaction signal handler. // Set a new-style sa_sigaction signal handler.
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
@@ -239,7 +239,7 @@ TEST(signal, sigaction) {
ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa)); ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa));
ASSERT_TRUE(sa.sa_sigaction == EmptySignalAction); ASSERT_TRUE(sa.sa_sigaction == EmptySignalAction);
ASSERT_TRUE((void*) sa.sa_sigaction == (void*) sa.sa_handler); ASSERT_TRUE((void*) sa.sa_sigaction == (void*) sa.sa_handler);
ASSERT_EQ((SA_ONSTACK | SA_SIGINFO), sa.sa_flags & ~sa_restorer); ASSERT_EQ(static_cast<unsigned>(SA_ONSTACK | SA_SIGINFO), sa.sa_flags & ~sa_restorer);
// Put everything back how it was. // Put everything back how it was.
ASSERT_EQ(0, sigaction(SIGALRM, &original_sa, NULL)); ASSERT_EQ(0, sigaction(SIGALRM, &original_sa, NULL));