commit 05ba56d6c0811928b555393e912b1080bc90c923
author Stephen Hines <srhines@google.com> Mon Oct 01 15:57:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 01 15:57:35 2018 +0000
tree ab6a03a40305c18e906d22b015e1a04e746fbcc6
parent f3ff8dc6f42583ca179cf87919a0aa15597b942b
parent cd659d410a113b82abea37363844acdf986e25e5

Merge "Fix up a few bionic tests for the clang-r339409 update."

tests/float_test.cpp

diff --git a/tests/float_test.cpp b/tests/float_test.cpp
index a75214e..3ef4593 100644
--- a/tests/float_test.cpp
+++ b/tests/float_test.cpp
@@ -112,16 +112,13 @@
 #if !defined(FLT_EVAL_METHOD)
 #error FLT_EVAL_METHOD
 #endif
-// TODO: FLT_HAS_SUBNORM currently missing from clang. Negate this test when fixed.
-#if defined(FLT_HAS_SUBNORM)
+#if !defined(FLT_HAS_SUBNORM)
 #error FLT_HAS_SUBNORM
 #endif
-// TODO: DBL_HAS_SUBNORM currently missing from clang. Negate this test when fixed.
-#if defined(DBL_HAS_SUBNORM)
+#if !defined(DBL_HAS_SUBNORM)
 #error DBL_HAS_SUBNORM
 #endif
-// TODO: LDBL_HAS_SUBNORM currently missing from clang. Negate this test when fixed.
-#if defined(LDBL_HAS_SUBNORM)
+#if !defined(LDBL_HAS_SUBNORM)
 #error LDBL_HAS_SUBNORM
 #endif
 }

tests/fortify_filecheck_diagnostics_test.cpp

diff --git a/tests/fortify_filecheck_diagnostics_test.cpp b/tests/fortify_filecheck_diagnostics_test.cpp
index a69b967..e79a9a6 100644
--- a/tests/fortify_filecheck_diagnostics_test.cpp
+++ b/tests/fortify_filecheck_diagnostics_test.cpp
@@ -291,7 +291,10 @@
   char from[4] = {0};
   // NOLINTNEXTLINE(whitespace/line_length)
   // CLANG: 'memset' will set 0 bytes; maybe the arguments got flipped?
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmemset-transposed-args"
   memset(from, sizeof(from), 0);
+#pragma clang diagnostic pop
 }
 
 void test_sendto() {