From: Michael Lee <mzlee@fb.com>
Date: Mon, 24 Apr 2017 17:47:24 +0000 (-0700)
Subject: Properly gate the wchar tests in FBStringTest
X-Git-Tag: v2017.05.01.00~16
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=dee718a22fcc0c081ccc56c4b8f0fb3c567fc062

Properly gate the wchar tests in FBStringTest

Summary: Using `#ifndef __ANDROID__` does not necessarily handle all cases of gating the wchar tests

Reviewed By: Orvid

Differential Revision: D4938634

fbshipit-source-id: a2184e20b8c382e5a34947c029f7e3746272b407
---

diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index 44d7864b..2c867dd1 100644
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -1596,7 +1596,7 @@ TEST(U16FBString, compareToStdU16StringLong) {
   EXPECT_TRUE(fbB >= stdB);
 }
 
-#ifndef __ANDROID__ // Android's handling of char32_t causes this test to fail
+#if FOLLY_HAVE_WCHAR_SUPPORT
 TEST(U32FBString, compareToStdU32StringLong) {
   using folly::basic_fbstring;
   using namespace std::string_literals;