summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorSpencer Low <CompareAndSwap@gmail.com>2015-09-11 20:01:29 -0700
committerSpencer Low <CompareAndSwap@gmail.com>2015-09-11 20:01:29 -0700
commitb2d4949cee3739d101d5dc38598a6cae1795b4c8 (patch)
tree9984881d38254299d0c93cf3ec9bbb84ca743858 /base
parent7b749acd5f7de9448f851e84ac2d3d90d28e5f03 (diff)
libbase_test: get it building for Windows
Add to whitelist. For some reason, when compiling, parseint_test.cpp would encounter errors like the following: host cross C++: host_cross_libbase_test <= system/core/base/parseint_test.cpp In file included from external/gtest/include/gtest/gtest.h:1929:0, from system/core/base/parseint_test.cpp:19: system/core/base/parseint_test.cpp: In member function ‘virtual void parseint_signed_smoke_Test::TestBody()’: external/gtest/include/gtest/internal/gtest-internal.h:133:55: error: converting ‘false’ to pointer type for argument 1 of ‘char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)’ [-Werror=conversion-null] (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1) ^ external/gtest/include/gtest/gtest_pred_impl.h:77:52: note: in definition of macro ‘GTEST_ASSERT_’ if (const ::testing::AssertionResult gtest_ar = (expression)) \ ^ external/gtest/include/gtest/gtest_pred_impl.h:166:3: note: in expansion of macro ‘GTEST_PRED_FORMAT2_’ GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_) ^ external/gtest/include/gtest/gtest.h:1993:3: note: in expansion of macro ‘ASSERT_PRED_FORMAT2’ ASSERT_PRED_FORMAT2(::testing::internal:: \ ^ external/gtest/include/gtest/gtest.h:1994:32: note: in expansion of macro ‘GTEST_IS_NULL_LITERAL_’ EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \ ^ external/gtest/include/gtest/gtest.h:2011:32: note: in expansion of macro ‘GTEST_ASSERT_EQ’ # define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2) ^ system/core/base/parseint_test.cpp:23:3: note: in expansion of macro ‘ASSERT_EQ’ ASSERT_EQ(false, android::base::ParseInt("x", &i)); ^ For whatever reason, the gcc for Windows isn't handling the template metaprogramming correctly, so to work-around the issue, I search-and-replaced "ASSERT_EQ(false, " to "ASSERT_FALSE(" and "ASSERT_EQ(true, " to "ASSERT_TRUE(" and that seems to compile just fine for Linux and Windows (and the tests pass on both platforms). Change-Id: I05132909d1f4b18afff23139652a218649689f2d Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
Diffstat (limited to 'base')
-rw-r--r--base/Android.mk1
-rw-r--r--base/parseint_test.cpp36
2 files changed, 19 insertions, 18 deletions
diff --git a/base/Android.mk b/base/Android.mk
index ebc2e07dc..613636b61 100644
--- a/base/Android.mk
+++ b/base/Android.mk
@@ -98,6 +98,7 @@ include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS)
LOCAL_MODULE := libbase_test
+LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_SRC_FILES := $(libbase_test_src_files)
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CPPFLAGS := $(libbase_cppflags)
diff --git a/base/parseint_test.cpp b/base/parseint_test.cpp
index 6a109f44c..e19c6e3cd 100644
--- a/base/parseint_test.cpp
+++ b/base/parseint_test.cpp
@@ -20,49 +20,49 @@
TEST(parseint, signed_smoke) {
int i;
- ASSERT_EQ(false, android::base::ParseInt("x", &i));
- ASSERT_EQ(false, android::base::ParseInt("123x", &i));
+ ASSERT_FALSE(android::base::ParseInt("x", &i));
+ ASSERT_FALSE(android::base::ParseInt("123x", &i));
- ASSERT_EQ(true, android::base::ParseInt("123", &i));
+ ASSERT_TRUE(android::base::ParseInt("123", &i));
ASSERT_EQ(123, i);
- ASSERT_EQ(true, android::base::ParseInt("-123", &i));
+ ASSERT_TRUE(android::base::ParseInt("-123", &i));
ASSERT_EQ(-123, i);
short s;
- ASSERT_EQ(true, android::base::ParseInt("1234", &s));
+ ASSERT_TRUE(android::base::ParseInt("1234", &s));
ASSERT_EQ(1234, s);
- ASSERT_EQ(true, android::base::ParseInt("12", &i, 0, 15));
+ ASSERT_TRUE(android::base::ParseInt("12", &i, 0, 15));
ASSERT_EQ(12, i);
- ASSERT_EQ(false, android::base::ParseInt("-12", &i, 0, 15));
- ASSERT_EQ(false, android::base::ParseInt("16", &i, 0, 15));
+ ASSERT_FALSE(android::base::ParseInt("-12", &i, 0, 15));
+ ASSERT_FALSE(android::base::ParseInt("16", &i, 0, 15));
}
TEST(parseint, unsigned_smoke) {
unsigned int i;
- ASSERT_EQ(false, android::base::ParseUint("x", &i));
- ASSERT_EQ(false, android::base::ParseUint("123x", &i));
+ ASSERT_FALSE(android::base::ParseUint("x", &i));
+ ASSERT_FALSE(android::base::ParseUint("123x", &i));
- ASSERT_EQ(true, android::base::ParseUint("123", &i));
+ ASSERT_TRUE(android::base::ParseUint("123", &i));
ASSERT_EQ(123u, i);
- ASSERT_EQ(false, android::base::ParseUint("-123", &i));
+ ASSERT_FALSE(android::base::ParseUint("-123", &i));
unsigned short s;
- ASSERT_EQ(true, android::base::ParseUint("1234", &s));
+ ASSERT_TRUE(android::base::ParseUint("1234", &s));
ASSERT_EQ(1234u, s);
- ASSERT_EQ(true, android::base::ParseUint("12", &i, 15u));
+ ASSERT_TRUE(android::base::ParseUint("12", &i, 15u));
ASSERT_EQ(12u, i);
- ASSERT_EQ(false, android::base::ParseUint("-12", &i, 15u));
- ASSERT_EQ(false, android::base::ParseUint("16", &i, 15u));
+ ASSERT_FALSE(android::base::ParseUint("-12", &i, 15u));
+ ASSERT_FALSE(android::base::ParseUint("16", &i, 15u));
}
TEST(parseint, no_implicit_octal) {
int i;
- ASSERT_EQ(true, android::base::ParseInt("0123", &i));
+ ASSERT_TRUE(android::base::ParseInt("0123", &i));
ASSERT_EQ(123, i);
unsigned int u;
- ASSERT_EQ(true, android::base::ParseUint("0123", &u));
+ ASSERT_TRUE(android::base::ParseUint("0123", &u));
ASSERT_EQ(123u, u);
}