diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-04 15:43:10 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-04 15:43:10 -0700 |
| commit | aa13e839f06231b9299bb683a71abd954294b49b (patch) | |
| tree | 6ccc7c0b20a153bdcd4f1a7baaba4cc7f57505d2 | |
| parent | 05f0bfd6c56746aa4f737804ebb62b555dc0d921 (diff) | |
| download | bionic-aa13e839f06231b9299bb683a71abd954294b49b.tar.gz | |
Fix mips signed/unsigned signal_test.cpp build breakage.
Change-Id: I045ce017c0c51e1843193759a2eb6fc5b93e3867
| -rw-r--r-- | tests/signal_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/signal_test.cpp b/tests/signal_test.cpp index e53fd3af6..8fd8b72f7 100644 --- a/tests/signal_test.cpp +++ b/tests/signal_test.cpp @@ -202,7 +202,7 @@ TEST(signal, sigaction) { // 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 // 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. struct sigaction original_sa; @@ -210,7 +210,7 @@ TEST(signal, sigaction) { ASSERT_EQ(0, sigaction(SIGALRM, NULL, &original_sa)); ASSERT_TRUE(original_sa.sa_handler == 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. struct sigaction sa; @@ -225,7 +225,7 @@ TEST(signal, sigaction) { ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa)); ASSERT_TRUE(sa.sa_handler == EmptySignalHandler); 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. memset(&sa, 0, sizeof(sa)); @@ -239,7 +239,7 @@ TEST(signal, sigaction) { ASSERT_EQ(0, sigaction(SIGALRM, NULL, &sa)); ASSERT_TRUE(sa.sa_sigaction == EmptySignalAction); 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. ASSERT_EQ(0, sigaction(SIGALRM, &original_sa, NULL)); |