commit 29a89df9e2e056162b60a36194acce26fb2d3036
author Nick Kralevich <nnk@google.com> Wed Mar 27 23:46:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 27 23:46:09 2019 +0000
tree a87d627b7a9435490ea3c99077d2139aadbc464d
parent 2e824e3150c2d36ef6e1e45269f8538a80ff2525
parent 3cfedf4ff0616e7b4f448ed6577490c12937b9f0

Merge "param.h: whitespace cleanup"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index a27b1ce..182e8f7 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -77,14 +77,6 @@
     native_coverage: false,
     recovery_available: true,
 
-    arch: {
-        x86: {
-            no_libcrt: true,
-        },
-        x86_64: {
-            no_libcrt: true,
-        },
-    },
     // lld complains about duplicate symbols in libcrt and libgcc. Suppress the
     // warning since this is intended right now.
     ldflags: ["-Wl,-z,muldefs"],

tests/malloc_test.cpp

diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index a5cc34a..706de15 100644
--- a/tests/malloc_test.cpp
+++ b/tests/malloc_test.cpp
@@ -728,7 +728,7 @@
               testing::ExitedWithCode(0), "");
 #endif
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }
 
@@ -740,7 +740,7 @@
   limit = 32 * 1024 * 1024;
   ASSERT_FALSE(android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES, &limit, sizeof(limit)));
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }
 
@@ -805,7 +805,7 @@
 
   VerifyMaxPointers(max_pointers);
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }
 
@@ -833,7 +833,7 @@
 
   VerifyMaxPointers(max_pointers);
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }
 
@@ -853,7 +853,7 @@
 
   VerifyMaxPointers(max_pointers);
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }
 
@@ -915,6 +915,6 @@
     ASSERT_EQ(0, WEXITSTATUS(status));
   }
 #else
-  GTEST_LOG_(INFO) << "This tests a bionic extension.\n";
+  GTEST_SKIP() << "bionic extension";
 #endif
 }

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 8653d91..c890358 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -309,13 +309,23 @@
 TEST(time, strptime_P_p) {
   setenv("TZ", "UTC", 1);
 
+  // For parsing, %P and %p are the same: case doesn't matter.
+
   struct tm tm = {.tm_hour = 12};
   ASSERT_EQ('\0', *strptime("AM", "%p", &tm));
   EXPECT_EQ(0, tm.tm_hour);
 
   tm = {.tm_hour = 12};
+  ASSERT_EQ('\0', *strptime("am", "%p", &tm));
+  EXPECT_EQ(0, tm.tm_hour);
+
+  tm = {.tm_hour = 12};
   ASSERT_EQ('\0', *strptime("AM", "%P", &tm));
   EXPECT_EQ(0, tm.tm_hour);
+
+  tm = {.tm_hour = 12};
+  ASSERT_EQ('\0', *strptime("am", "%P", &tm));
+  EXPECT_EQ(0, tm.tm_hour);
 }
 
 TEST(time, strptime_u) {