Really Really fix tests broken at 9778206.

core/src/fxcrt/fx_system_unittest.cpp

 // Copyright 2015 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "../../../testing/fx_string_testhelpers.h"
 #include "../../include/fxcrt/fx_system.h"
 
 // Unit test covering cases where PDFium replaces well-known library
 // functionality on any given platformn.

[Lei Zhang, 2015/08/07 23:36:50]

BTW, typo heere.

+
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+
 namespace {
 
 const FX_CHAR kSentinel = 0x7f;
 
 void Check32BitBase16Itoa(int32_t input, const char* expected_output) {
   const size_t kBufLen = 11;  // "-" + 8 digits + NUL + sentinel.
   FX_CHAR buf[kBufLen];
   buf[kBufLen - 1] = kSentinel;
   FXSYS_itoa(input, buf, 16);
   EXPECT_EQ(std::string(expected_output), buf);
@@ skipping 40 matching lines @@
   const size_t kBufLen = 67;  // "-" + 64 digits + NUL + sentinel.
   FX_CHAR buf[kBufLen];
   buf[kBufLen - 1] = kSentinel;
   FXSYS_i64toa(input, buf, 2);
   EXPECT_EQ(std::string(expected_output), buf);
   EXPECT_EQ(kSentinel, buf[kBufLen - 1]);
 }
 
 }  // namespace
 
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
-
 TEST(fxcrt, FXSYS_itoa_InvalidRadix) {
   FX_CHAR buf[32];
 
   FXSYS_itoa(42, buf, 17);  // Ours stops at 16.
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_itoa(42, buf, 1);
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_itoa(42, buf, 0);
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_itoa(42, buf, -1);
   EXPECT_EQ(std::string(""), buf);
 }
 
-#endif  // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
-
 TEST(fxcrt, FXSYS_itoa) {
   Check32BitBase16Itoa(std::numeric_limits<int32_t>::min(), "-80000000");
   Check32BitBase10Itoa(std::numeric_limits<int32_t>::min(), "-2147483648");
   Check32BitBase2Itoa(std::numeric_limits<int32_t>::min(),
                       "-10000000000000000000000000000000");
 
   Check32BitBase16Itoa(-1, "-1");
   Check32BitBase10Itoa(-1, "-1");
   Check32BitBase2Itoa(-1, "-1");
 
   Check32BitBase16Itoa(0, "0");
   Check32BitBase10Itoa(0, "0");
   Check32BitBase2Itoa(0, "0");
 
   Check32BitBase16Itoa(42, "2a");
   Check32BitBase10Itoa(42, "42");
   Check32BitBase2Itoa(42, "101010");
 
   Check32BitBase16Itoa(std::numeric_limits<int32_t>::max(), "7fffffff");
   Check32BitBase10Itoa(std::numeric_limits<int32_t>::max(), "2147483647");
   Check32BitBase2Itoa(std::numeric_limits<int32_t>::max(),
                       "1111111111111111111111111111111");
 }
 
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
-
 TEST(fxcrt, FXSYS_i64toa_InvalidRadix) {
   FX_CHAR buf[32];
 
   FXSYS_i64toa(42, buf, 17);  // Ours stops at 16.
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_i64toa(42, buf, 1);
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_i64toa(42, buf, 0);
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_i64toa(42, buf, -1);
   EXPECT_EQ(std::string(""), buf);
 };
 
-#endif  // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 
 TEST(fxcrt, FXSYS_i64toa) {
   Check64BitBase16Itoa(
       std::numeric_limits<int64_t>::min(), "-8000000000000000");
   Check64BitBase10Itoa(
       std::numeric_limits<int64_t>::min(), "-9223372036854775808");
   Check64BitBase2Itoa(
       std::numeric_limits<int64_t>::min(),
       "-1000000000000000000000000000000000000000000000000000000000000000");
 
@@ skipping 10 matching lines @@
   Check64BitBase2Itoa(42, "101010");
 
   Check64BitBase16Itoa(
       std::numeric_limits<int64_t>::max(), "7fffffffffffffff");
   Check64BitBase10Itoa(
       std::numeric_limits<int64_t>::max(), "9223372036854775807");
   Check64BitBase2Itoa(
       std::numeric_limits<int64_t>::max(),
       "111111111111111111111111111111111111111111111111111111111111111");
 }
+
+#endif  // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+