b2d4949cee
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> |
||
---|---|---|
.. | ||
include/base | ||
.clang-format | ||
Android.mk | ||
CPPLINT.cfg | ||
file.cpp | ||
file_test.cpp | ||
logging.cpp | ||
logging_test.cpp | ||
parseint_test.cpp | ||
stringprintf.cpp | ||
stringprintf_test.cpp | ||
strings.cpp | ||
strings_test.cpp | ||
test_main.cpp | ||
test_utils.cpp |