Use the GTest portability headers

Summary:
Switch all of the uses of `<gtest/gtest.h>` to `<folly/portability/GTest.h>`.

This is painful but necessary to get the tests to compile nicely under MSVC.

Reviewed By: yfeldblum

Differential Revision: D3837300

fbshipit-source-id: 7ae43a5d5ba94c8c24fa23a485f18546416e7191

diff --git a/folly/experimental/bser/test/BserTest.cpp b/folly/experimental/bser/test/BserTest.cpp
index e2672cbefdc92e243b61c496ed445ccd62a7d1cb..8534d5368afd4431dd9faea1f2e524333c00b0a0 100644 (file)
--- a/folly/experimental/bser/test/BserTest.cpp
+++ b/folly/experimental/bser/test/BserTest.cpp
@@ -15,7 +15,7 @@
  */
 #include <folly/experimental/bser/Bser.h>
 #include <folly/String.h>
  */
 #include <folly/experimental/bser/Bser.h>
 #include <folly/String.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::dynamic;
 
 
 using folly::dynamic;
 

diff --git a/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp b/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp
index 37d63921f592964dc904c274569685422f994a48..24b413e95d6449ab4e1912752b9cea4fb9a2da89 100644 (file)
--- a/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp
+++ b/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp
@@ -21,9 +21,8 @@
 #include <condition_variable>
 #include <sstream>
 
 #include <condition_variable>
 #include <sstream>
 

-#include <gtest/gtest.h>
-

 #include <folly/experimental/exception_tracer/ExceptionCounterLib.h>
 #include <folly/experimental/exception_tracer/ExceptionCounterLib.h>

+#include <folly/portability/GTest.h>

 
 struct MyException {};
 
 
 struct MyException {};
 

diff --git a/folly/experimental/io/test/AsyncIOTest.cpp b/folly/experimental/io/test/AsyncIOTest.cpp
index eae19c1d9d2ae59bdf48d57d592ab41d3d9da761..f7272d479d225c3d7ce580a16998938f456fbd0f 100644 (file)
--- a/folly/experimental/io/test/AsyncIOTest.cpp
+++ b/folly/experimental/io/test/AsyncIOTest.cpp
@@ -28,11 +28,11 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
 
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 
 namespace fs = folly::fs;
 #include <folly/portability/Sockets.h>
 
 namespace fs = folly::fs;

diff --git a/folly/experimental/io/test/FsUtilTest.cpp b/folly/experimental/io/test/FsUtilTest.cpp
index 227898734d7e8dd8e0608061b91da5aff15f2a54..fd23b90d422c6c9c49122d3fc284bcb0e7703729 100644 (file)
--- a/folly/experimental/io/test/FsUtilTest.cpp
+++ b/folly/experimental/io/test/FsUtilTest.cpp
@@ -17,7 +17,8 @@
 #include <folly/experimental/io/FsUtil.h>
 
 #include <glog/logging.h>
 #include <folly/experimental/io/FsUtil.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::fs;
 
 using namespace folly;
 using namespace folly::fs;

diff --git a/folly/experimental/observer/test/ObserverTest.cpp b/folly/experimental/observer/test/ObserverTest.cpp
index 6ace4203ae03973860ab2a46ab02078344e2bded..c2be17b9e0529fe9abb9d059e3c78a7adc119fc8 100644 (file)
--- a/folly/experimental/observer/test/ObserverTest.cpp
+++ b/folly/experimental/observer/test/ObserverTest.cpp
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

-#include <gtest/gtest.h>

 
 #include <thread>
 
 #include <folly/Baton.h>
 #include <folly/experimental/observer/SimpleObservable.h>
 
 #include <thread>
 
 #include <folly/Baton.h>
 #include <folly/experimental/observer/SimpleObservable.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::observer;
 
 
 using namespace folly::observer;
 

diff --git a/folly/experimental/symbolizer/test/DwarfTests.cpp b/folly/experimental/symbolizer/test/DwarfTests.cpp
index 676bedd09b1b94719772b6512ceb2446249fa196..00834ee59d2a045af666d0dd0c3ffc42e53eb4f1 100644 (file)
--- a/folly/experimental/symbolizer/test/DwarfTests.cpp
+++ b/folly/experimental/symbolizer/test/DwarfTests.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/experimental/symbolizer/Dwarf.h>
 
 
 #include <folly/experimental/symbolizer/Dwarf.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::symbolizer::Dwarf;
 
 
 using folly::symbolizer::Dwarf;
 

diff --git a/folly/experimental/symbolizer/test/ElfTests.cpp b/folly/experimental/symbolizer/test/ElfTests.cpp
index 84d526c5679d00d548e1acbdcfbb24ca7e4bdd36..32ef4e0749df55da22d12294a82526278e7dcf13 100644 (file)
--- a/folly/experimental/symbolizer/test/ElfTests.cpp
+++ b/folly/experimental/symbolizer/test/ElfTests.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/experimental/symbolizer/Elf.h>
 #include <folly/experimental/symbolizer/Elf.h>

+#include <folly/portability/GTest.h>

 
 using folly::symbolizer::ElfFile;
 
 
 using folly::symbolizer::ElfFile;
 

diff --git a/folly/experimental/symbolizer/test/LineReaderTest.cpp b/folly/experimental/symbolizer/test/LineReaderTest.cpp
index 61a748b51e1769bec4efb7498334e11c7483cdcc..3e825722f18e673aa340227c0583def6395ea368 100644 (file)
--- a/folly/experimental/symbolizer/test/LineReaderTest.cpp
+++ b/folly/experimental/symbolizer/test/LineReaderTest.cpp
@@ -17,10 +17,10 @@
 #include <folly/experimental/symbolizer/LineReader.h>
 
 #include <glog/logging.h>
 #include <folly/experimental/symbolizer/LineReader.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/FileUtil.h>
 #include <folly/experimental/TestUtil.h>
 
 #include <folly/FileUtil.h>
 #include <folly/experimental/TestUtil.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace symbolizer { namespace test {
 
 
 namespace folly { namespace symbolizer { namespace test {
 

diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index 77b642ca2152ea030e0dd762a901b066971340b9..fa0e4721afa8408a1ff03e6002bae48eae03633f 100644 (file)
--- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@ -17,11 +17,10 @@
 #include <folly/experimental/symbolizer/test/SignalHandlerTest.h>
 #include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <folly/experimental/symbolizer/test/SignalHandlerTest.h>
 #include <folly/experimental/symbolizer/SignalHandler.h>
 

-#include <gtest/gtest.h>
-

 #include <folly/FileUtil.h>
 #include <folly/Range.h>
 #include <folly/CPortability.h>
 #include <folly/FileUtil.h>
 #include <folly/Range.h>
 #include <folly/CPortability.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace symbolizer { namespace test {
 
 
 namespace folly { namespace symbolizer { namespace test {
 

diff --git a/folly/experimental/symbolizer/test/StackTraceTest.cpp b/folly/experimental/symbolizer/test/StackTraceTest.cpp
index 9a58c61b996d901bd8a00e0f31bf1c1d031d6074..c4fe7f754e78c8348063440c79b7385faffe2407 100644 (file)
--- a/folly/experimental/symbolizer/test/StackTraceTest.cpp
+++ b/folly/experimental/symbolizer/test/StackTraceTest.cpp
@@ -18,7 +18,8 @@
 #include <folly/experimental/symbolizer/Symbolizer.h>
 
 #include <glog/logging.h>
 #include <folly/experimental/symbolizer/Symbolizer.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::symbolizer;
 
 using namespace folly;
 using namespace folly::symbolizer;

diff --git a/folly/experimental/symbolizer/test/SymbolizerTest.cpp b/folly/experimental/symbolizer/test/SymbolizerTest.cpp
index efcb4047a28a08e0e7d9436fffc7df9e9217375b..66435cbcd3b5818311b496d89a0a29b085cd0291 100644 (file)
--- a/folly/experimental/symbolizer/test/SymbolizerTest.cpp
+++ b/folly/experimental/symbolizer/test/SymbolizerTest.cpp
@@ -18,10 +18,9 @@
 
 #include <cstdlib>
 
 
 #include <cstdlib>
 

-#include <gtest/gtest.h>
-

 #include <folly/Range.h>
 #include <folly/String.h>
 #include <folly/Range.h>
 #include <folly/String.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace symbolizer { namespace test {
 
 
 namespace folly { namespace symbolizer { namespace test {
 

diff --git a/folly/experimental/test/AutoTimerTest.cpp b/folly/experimental/test/AutoTimerTest.cpp
index de8e3134443e55efefa4ae3368eb2efcabce100b..f4c71c5189294fe2cd87397f18022a02125a0222 100644 (file)
--- a/folly/experimental/test/AutoTimerTest.cpp
+++ b/folly/experimental/test/AutoTimerTest.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>

 #include <folly/experimental/AutoTimer.h>
 
 #include <folly/experimental/AutoTimer.h>
 

+#include <folly/portability/GTest.h>
+

 using namespace folly;
 using namespace std;
 
 using namespace folly;
 using namespace std;
 

diff --git a/folly/experimental/test/BitsTest.cpp b/folly/experimental/test/BitsTest.cpp
index b09a768f5294ac3bccd0b1a492e0a33ee78b3017..58a5a5a7e63f573be834ce6c0c5fc64bb4f0249d 100644 (file)
--- a/folly/experimental/test/BitsTest.cpp
+++ b/folly/experimental/test/BitsTest.cpp
@@ -17,7 +17,8 @@
 #include <folly/experimental/Bits.h>
 
 #include <glog/logging.h>
 #include <folly/experimental/Bits.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/experimental/test/CodingTestUtils.h b/folly/experimental/test/CodingTestUtils.h
index d16f31e72a60b0b1c81fcaa199c7d5f9beb57065..7789df1414a05c33b1db9dd8ed8216e7e22af56c 100644 (file)
--- a/folly/experimental/test/CodingTestUtils.h
+++ b/folly/experimental/test/CodingTestUtils.h
@@ -24,7 +24,8 @@
 #include <vector>
 #include <unordered_set>
 #include <glog/logging.h>
 #include <vector>
 #include <unordered_set>
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 namespace folly { namespace compression {
 
 
 namespace folly { namespace compression {
 

diff --git a/folly/experimental/test/DynamicParserTest.cpp b/folly/experimental/test/DynamicParserTest.cpp
index 39bc5752b91757df35c36c4983a0e8fe1b091b7d..38db3030357f9571ea88333eb4b83fc08b78a9c1 100644 (file)
--- a/folly/experimental/test/DynamicParserTest.cpp
+++ b/folly/experimental/test/DynamicParserTest.cpp
@@ -25,7 +25,7 @@
 #include <folly/Optional.h>
 #include <folly/experimental/DynamicParser.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/Optional.h>
 #include <folly/experimental/DynamicParser.h>
 #include <folly/experimental/TestUtil.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using dynamic = folly::dynamic;
 
 using namespace folly;
 using dynamic = folly::dynamic;

diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp
index b5257608c50a8eda3c4c50eece28c3db091d601e..e01fa1f157fe5384b8475b7ab8c985097d9f7d5b 100644 (file)
--- a/folly/experimental/test/EventCountTest.cpp
+++ b/folly/experimental/test/EventCountTest.cpp
@@ -22,9 +22,9 @@
 #include <thread>
 #include <vector>
 #include <glog/logging.h>
 #include <thread>
 #include <vector>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Random.h>
 
 #include <folly/Random.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/experimental/test/FunctionSchedulerTest.cpp b/folly/experimental/test/FunctionSchedulerTest.cpp
index 8e0ea8e1b6fddb3186254155c3f46012bec913c4..e54d1b4abfb9a0a851026c7a6f5eb467304c2920 100644 (file)
--- a/folly/experimental/test/FunctionSchedulerTest.cpp
+++ b/folly/experimental/test/FunctionSchedulerTest.cpp
@@ -20,7 +20,8 @@
 #include <cassert>
 #include <random>
 #include <folly/Random.h>
 #include <cassert>
 #include <random>
 #include <folly/Random.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using std::chrono::milliseconds;
 
 using namespace folly;
 using std::chrono::milliseconds;

diff --git a/folly/experimental/test/FutureDAGTest.cpp b/folly/experimental/test/FutureDAGTest.cpp
index 1fb947aa86aee35d8da217f1adf478c6d4cc1f6e..c15a8a21e2b502bb82cdd25f26612be2b3cd72f9 100644 (file)
--- a/folly/experimental/test/FutureDAGTest.cpp
+++ b/folly/experimental/test/FutureDAGTest.cpp
@@ -15,7 +15,7 @@
  */
 #include <boost/thread/barrier.hpp>
 #include <folly/experimental/FutureDAG.h>
  */
 #include <boost/thread/barrier.hpp>
 #include <folly/experimental/FutureDAG.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/experimental/test/JSONSchemaTest.cpp b/folly/experimental/test/JSONSchemaTest.cpp
index 84f3fa923562c13da84e05dbf90d335565f8c177..04a7a0955863d47e8dfaf177cb95aca4f199f999 100644 (file)
--- a/folly/experimental/test/JSONSchemaTest.cpp
+++ b/folly/experimental/test/JSONSchemaTest.cpp
@@ -17,7 +17,7 @@
 
 #include <folly/experimental/JSONSchema.h>
 #include <folly/json.h>
 
 #include <folly/experimental/JSONSchema.h>
 #include <folly/json.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::dynamic;
 using folly::parseJson;
 
 using folly::dynamic;
 using folly::parseJson;

diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
index 14b373d28f54d390b2f58255705243ab4ee0b0eb..edd666b53f4f5986ae6042ee8e9efc89fd867fe3 100644 (file)
--- a/folly/experimental/test/LockFreeRingBufferTest.cpp
+++ b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>

 #include <iostream>
 #include <thread>
 
 #include <folly/detail/Futex.h>
 #include <folly/experimental/LockFreeRingBuffer.h>
 #include <folly/test/DeterministicSchedule.h>
 #include <iostream>
 #include <thread>
 
 #include <folly/detail/Futex.h>
 #include <folly/experimental/LockFreeRingBuffer.h>
 #include <folly/test/DeterministicSchedule.h>

+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/experimental/test/NestedCommandLineAppTest.cpp b/folly/experimental/test/NestedCommandLineAppTest.cpp
index b52ab804a56971c069521ab5a96274a7e9315824..d4b749c0f50972a587cad9499ef906c5f04529ac 100644 (file)
--- a/folly/experimental/test/NestedCommandLineAppTest.cpp
+++ b/folly/experimental/test/NestedCommandLineAppTest.cpp
@@ -18,8 +18,8 @@
 
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>
 
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>

+#include <folly/portability/GTest.h>

 #include <glog/logging.h>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/experimental/test/ProgramOptionsTest.cpp b/folly/experimental/test/ProgramOptionsTest.cpp
index 9dd175c13e75beb9aa7921c563bfb4fef69ead26..c54dd54b0a8bb9630009db80820778b7aa193e0a 100644 (file)
--- a/folly/experimental/test/ProgramOptionsTest.cpp
+++ b/folly/experimental/test/ProgramOptionsTest.cpp
@@ -19,8 +19,8 @@
 #include <folly/FileUtil.h>
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/FileUtil.h>
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>

+#include <folly/portability/GTest.h>

 #include <glog/logging.h>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/experimental/test/ReadMostlySharedPtrTest.cpp b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
index 4f683586d5acb1a290baf652bf1ee848e0acf85f..ffbe0d45c94218329052df7b05c20aa52597d8b8 100644 (file)
--- a/folly/experimental/test/ReadMostlySharedPtrTest.cpp
+++ b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
@@ -20,11 +20,11 @@
 #include <mutex>
 #include <folly/Memory.h>
 #include <condition_variable>
 #include <mutex>
 #include <folly/Memory.h>
 #include <condition_variable>

-#include <gtest/gtest.h>

 
 #include <folly/Baton.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>
 
 #include <folly/Baton.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>

+#include <folly/portability/GTest.h>

 
 using folly::ReadMostlyMainPtr;
 using folly::ReadMostlyWeakPtr;
 
 using folly::ReadMostlyMainPtr;
 using folly::ReadMostlyWeakPtr;

diff --git a/folly/experimental/test/RefCountTest.cpp b/folly/experimental/test/RefCountTest.cpp
index a9b08143a9866a72ddb376f8e50eed836c18aa08..440f25ea48d6687a65bb76d62d0a666d5a0bc0c1 100644 (file)
--- a/folly/experimental/test/RefCountTest.cpp
+++ b/folly/experimental/test/RefCountTest.cpp
@@ -18,8 +18,7 @@
 #include <folly/Baton.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/TLRefCount.h>
 #include <folly/Baton.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/TLRefCount.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp
index dd05d0a3e6a89a3a3989e68a41a566181e880417..446e74a392dfe82352fa47f896c70364701294c3 100644 (file)
--- a/folly/experimental/test/StringKeyedTest.cpp
+++ b/folly/experimental/test/StringKeyedTest.cpp
@@ -24,10 +24,10 @@
 #include <string>
 
 #include <glog/logging.h>
 #include <string>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Range.h>
 #include <folly/portability/GFlags.h>
 
 #include <folly/Range.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using folly::StringKeyedMap;
 using folly::StringKeyedSetBase;
 
 using folly::StringKeyedMap;
 using folly::StringKeyedSetBase;

diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp
index 3110f6fa4bb7ceecd9eae3103129b9da3bbe5199..79046e0736ea126f8b91f4339a4a45ee192ea61e 100644 (file)
--- a/folly/experimental/test/TestUtilTest.cpp
+++ b/folly/experimental/test/TestUtilTest.cpp
@@ -23,11 +23,11 @@
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Memory.h>
 #include <folly/portability/Environment.h>
 #include <folly/portability/Fcntl.h>
 
 #include <folly/Memory.h>
 #include <folly/portability/Environment.h>
 #include <folly/portability/Fcntl.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::test;
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/experimental/test/TupleOpsTest.cpp b/folly/experimental/test/TupleOpsTest.cpp
index 24df7b21de7853109205fe28091d9aa0f0888ce1..80071eaaa5cc21ba3ef4996412147c0891d11858 100644 (file)
--- a/folly/experimental/test/TupleOpsTest.cpp
+++ b/folly/experimental/test/TupleOpsTest.cpp
@@ -17,8 +17,9 @@
 #include <folly/experimental/TupleOps.h>
 
 #include <folly/Conv.h>
 #include <folly/experimental/TupleOps.h>
 
 #include <folly/Conv.h>

+#include <folly/portability/GTest.h>
+

 #include <glog/logging.h>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/fibers/test/FibersTest.cpp b/folly/fibers/test/FibersTest.cpp
index bbb5ddcfdaec149426ec1658dd4370f72faa25c3..2a05fd4b8b5fb28677afbdcd75cb8952ef7dc495 100644 (file)
--- a/folly/fibers/test/FibersTest.cpp
+++ b/folly/fibers/test/FibersTest.cpp
@@ -17,8 +17,6 @@
 #include <thread>
 #include <vector>
 
 #include <thread>
 #include <vector>
 

-#include <gtest/gtest.h>
-

 #include <folly/Memory.h>
 #include <folly/futures/Future.h>
 
 #include <folly/Memory.h>
 #include <folly/futures/Future.h>
 


@@ -30,6 +28,7 @@
 #include <folly/fibers/Semaphore.h>
 #include <folly/fibers/SimpleLoopController.h>
 #include <folly/fibers/WhenN.h>
 #include <folly/fibers/Semaphore.h>
 #include <folly/fibers/SimpleLoopController.h>
 #include <folly/fibers/WhenN.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::fibers;
 
 
 using namespace folly::fibers;
 

diff --git a/folly/futures/test/BarrierTest.cpp b/folly/futures/test/BarrierTest.cpp
index 47a3e3d9e0901c3b23bf6c4306a9816defcfc450..8e4f7896acb6330c9f5987539d03960d3b1f759a 100644 (file)
--- a/folly/futures/test/BarrierTest.cpp
+++ b/folly/futures/test/BarrierTest.cpp
@@ -21,8 +21,9 @@
 #include <mutex>
 
 #include <folly/Random.h>
 #include <mutex>
 
 #include <folly/Random.h>

+#include <folly/portability/GTest.h>
+

 #include <glog/logging.h>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace futures { namespace test {
 
 
 namespace folly { namespace futures { namespace test {
 

diff --git a/folly/futures/test/CollectTest.cpp b/folly/futures/test/CollectTest.cpp
index 673161aa5c8a2dcd09812f0524ee0c498ca575b2..f7cb1b921b698caa90b32b6cd9d277502136c463 100644 (file)
--- a/folly/futures/test/CollectTest.cpp
+++ b/folly/futures/test/CollectTest.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <numeric>
 
 #include <boost/thread/barrier.hpp>
 #include <numeric>
 
 #include <boost/thread/barrier.hpp>


@@ -23,6 +21,7 @@
 #include <folly/futures/Future.h>
 #include <folly/Random.h>
 #include <folly/small_vector.h>
 #include <folly/futures/Future.h>
 #include <folly/Random.h>
 #include <folly/small_vector.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/ContextTest.cpp b/folly/futures/test/ContextTest.cpp
index e5946b2657218ace5e8dffd880ec73510c2b6498..0451a80d69e394725a7a31374e0d40dd59c0dab4 100644 (file)
--- a/folly/futures/test/ContextTest.cpp
+++ b/folly/futures/test/ContextTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/ConversionTest.cpp b/folly/futures/test/ConversionTest.cpp
index 53b15b1b899877e5b166bb8bc7073c8b268d12aa..e300c4e87a71ddcb4cd299cf6a99a0ab99b7fe39 100644 (file)
--- a/folly/futures/test/ConversionTest.cpp
+++ b/folly/futures/test/ConversionTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>
+

 #include <type_traits>
 
 using namespace folly;
 #include <type_traits>
 
 using namespace folly;

diff --git a/folly/futures/test/CoreTest.cpp b/folly/futures/test/CoreTest.cpp
index c65a76d0564280020a4838212c0f0a71831319dc..7d2dc1b3f2aba89651c861139060f301db04b01b 100644 (file)
--- a/folly/futures/test/CoreTest.cpp
+++ b/folly/futures/test/CoreTest.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/detail/Core.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/detail/Core.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/EnsureTest.cpp b/folly/futures/test/EnsureTest.cpp
index 62122027d93a78945de03a1d52334c458704c022..925f96f4fe0e9a49f6aa0c7bf753fc61f2e2d7c5 100644 (file)
--- a/folly/futures/test/EnsureTest.cpp
+++ b/folly/futures/test/EnsureTest.cpp
@@ -17,9 +17,8 @@
 #include <memory>
 #include <unordered_set>
 
 #include <memory>
 #include <unordered_set>
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp
index b11a8a6c6dfa624b0442b603d03307839e392ffd..9730ef4326c41760c8fcac91096d709da083ae1e 100644 (file)
--- a/folly/futures/test/ExecutorTest.cpp
+++ b/folly/futures/test/ExecutorTest.cpp
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/QueuedImmediateExecutor.h>
 #include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/QueuedImmediateExecutor.h>
 #include <folly/Baton.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/FSMTest.cpp b/folly/futures/test/FSMTest.cpp
index 1dd4f6bbfce83af08265816af85b64232139c9be..6f315dd07afb418e43dce9dba0396776a81c0eda 100644 (file)
--- a/folly/futures/test/FSMTest.cpp
+++ b/folly/futures/test/FSMTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/detail/FSM.h>
 #include <folly/futures/detail/FSM.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::detail;
 
 
 using namespace folly::detail;
 

diff --git a/folly/futures/test/FilterTest.cpp b/folly/futures/test/FilterTest.cpp
index 9159587d837173361f41238b61d5a53ffe225500..a8baf5656ce844889a2526267e3e57d335577c36 100644 (file)
--- a/folly/futures/test/FilterTest.cpp
+++ b/folly/futures/test/FilterTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index a025dba9771b70c2609bc37143b94f4f60fa90c3..8a66184af8e5dceec1417c8eac57244ab9104f31 100644 (file)
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/Unit.h>
 #include <folly/Memory.h>
 #include <folly/Executor.h>
 #include <folly/dynamic.h>
 #include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/Unit.h>
 #include <folly/Memory.h>
 #include <folly/Executor.h>
 #include <folly/dynamic.h>
 #include <folly/Baton.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 #include <algorithm>
 #include <folly/portability/Unistd.h>
 
 #include <algorithm>

diff --git a/folly/futures/test/HeaderCompileTest.cpp b/folly/futures/test/HeaderCompileTest.cpp
index ae2e5dedc02b7f52086d122928c81075e6325633..f2fe83640ab5264d4625a7338a1f2bb295cdd97a 100644 (file)
--- a/folly/futures/test/HeaderCompileTest.cpp
+++ b/folly/futures/test/HeaderCompileTest.cpp
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 // amazing what things can go wrong if you include things in an unexpected
 // order.
 #include <folly/Try.h>
 #include <folly/futures/Promise.h>
 #include <folly/futures/Future.h>
 // amazing what things can go wrong if you include things in an unexpected
 // order.
 #include <folly/Try.h>
 #include <folly/futures/Promise.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 TEST(Basic, compiles) {
   EXPECT_TRUE(true);
 
 TEST(Basic, compiles) {
   EXPECT_TRUE(true);

diff --git a/folly/futures/test/InterruptTest.cpp b/folly/futures/test/InterruptTest.cpp
index 16a8e082dacb044a58c7029c98cf67561a554856..5c599b0ad9b56482fe5a72e1d919913cdaf4fc56 100644 (file)
--- a/folly/futures/test/InterruptTest.cpp
+++ b/folly/futures/test/InterruptTest.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <folly/Baton.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/MapTest.cpp b/folly/futures/test/MapTest.cpp
index 743a082a2b752a7153d82961070c8263abb6399e..e972deda507471210c84afa8204cdd797480a21a 100644 (file)
--- a/folly/futures/test/MapTest.cpp
+++ b/folly/futures/test/MapTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/NonCopyableLambdaTest.cpp b/folly/futures/test/NonCopyableLambdaTest.cpp
index 73bc6dc776d64eb53cb8014d9913ecce25af0cfb..b499400ac50268b8d7503e697000bfbb22c4d648 100644 (file)
--- a/folly/futures/test/NonCopyableLambdaTest.cpp
+++ b/folly/futures/test/NonCopyableLambdaTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/PollTest.cpp b/folly/futures/test/PollTest.cpp
index ae82fed96fdb963affbc50ae93c5db1cd62fae08..c518d4534b5d32d12ad7b7d254c41ae8c11e8566 100644 (file)
--- a/folly/futures/test/PollTest.cpp
+++ b/folly/futures/test/PollTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/PromiseTest.cpp b/folly/futures/test/PromiseTest.cpp
index 126518c0fc54082f3c7b3bab73be931df637b4b8..89431a282b4f80de7da9e2633821cd0f6acc2571 100644 (file)
--- a/folly/futures/test/PromiseTest.cpp
+++ b/folly/futures/test/PromiseTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using std::unique_ptr;
 
 using namespace folly;
 using std::unique_ptr;

diff --git a/folly/futures/test/ReduceTest.cpp b/folly/futures/test/ReduceTest.cpp
index bf613ef6123db8e4d01bac0162c02600ad1d56ca..c5462dda4aaf16b346202aa379954c5865571d20 100644 (file)
--- a/folly/futures/test/ReduceTest.cpp
+++ b/folly/futures/test/ReduceTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/RetryingTest.cpp b/folly/futures/test/RetryingTest.cpp
index a57507cd5519d459d473521cfe0aa4dc91fbbf9d..6988e5dff1bb7c40973f5279a302eceba12576c7 100644 (file)
--- a/folly/futures/test/RetryingTest.cpp
+++ b/folly/futures/test/RetryingTest.cpp
@@ -18,9 +18,10 @@
 #include <atomic>
 #include <exception>
 #include <vector>
 #include <atomic>
 #include <exception>
 #include <vector>

+

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 
 using namespace std;
 using namespace std::chrono;
 
 using namespace std;
 using namespace std::chrono;

diff --git a/folly/futures/test/SelfDestructTest.cpp b/folly/futures/test/SelfDestructTest.cpp
index 68a75d09967bca243904620c71caa694844a01f6..4638eaee941c7e6d881e4ec52c34488b11cef7e0 100644 (file)
--- a/folly/futures/test/SelfDestructTest.cpp
+++ b/folly/futures/test/SelfDestructTest.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/SharedPromiseTest.cpp b/folly/futures/test/SharedPromiseTest.cpp
index b75e9f08f3f0745b606a3383b3202fdf8cda2711..36b5169b5bbd3b1ed66de6fb36ac02af60e7496b 100644 (file)
--- a/folly/futures/test/SharedPromiseTest.cpp
+++ b/folly/futures/test/SharedPromiseTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/SharedPromise.h>
 #include <folly/futures/SharedPromise.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/ThenCompileTest.h b/folly/futures/test/ThenCompileTest.h
index 75eb26bd4a940239d2fc85db01e35eaa35abdd5f..2769ced63507de6c8898c3de8fa100472eeb7709 100644 (file)
--- a/folly/futures/test/ThenCompileTest.h
+++ b/folly/futures/test/ThenCompileTest.h
@@ -16,9 +16,8 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 #include <memory>
 
 
 #include <memory>
 

diff --git a/folly/futures/test/ThenTest.cpp b/folly/futures/test/ThenTest.cpp
index 4ba5398886d0b2d08249ae8e079dddaf432cfa2a..11f59b01fb79771e0a2e1a018e601bc4aa364956 100644 (file)
--- a/folly/futures/test/ThenTest.cpp
+++ b/folly/futures/test/ThenTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 #include <thread>
 
 
 #include <thread>
 

diff --git a/folly/futures/test/TimekeeperTest.cpp b/folly/futures/test/TimekeeperTest.cpp
index c20668c08a5ea444bc287622141f54c5c75b13ef..676d635124b73920fb16d9693b7e1b07e5a72d3b 100644 (file)
--- a/folly/futures/test/TimekeeperTest.cpp
+++ b/folly/futures/test/TimekeeperTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Timekeeper.h>
 #include <folly/futures/Timekeeper.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 using namespace folly;
 #include <folly/portability/Unistd.h>
 
 using namespace folly;

diff --git a/folly/futures/test/TimesTest.cpp b/folly/futures/test/TimesTest.cpp
index 84549c1e21056b64d2c282fe00a924d99d0a3ea2..8354ef9ab3b83563c8b91be1fab7de03c17a1c42 100644 (file)
--- a/folly/futures/test/TimesTest.cpp
+++ b/folly/futures/test/TimesTest.cpp
@@ -18,11 +18,11 @@
 #include <mutex>
 #include <queue>
 
 #include <mutex>
 #include <queue>
 

-#include <gtest/gtest.h>

 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/UnwrapTest.cpp b/folly/futures/test/UnwrapTest.cpp
index be259f81692f9b440c93926d8483739afa0a8b7b..521b29645f45c72bdcd06f196fa976fa566382b0 100644 (file)
--- a/folly/futures/test/UnwrapTest.cpp
+++ b/folly/futures/test/UnwrapTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp
index c864b9027c2bd9944fc3090f84856dba2c22214e..765fdf6c74010f9b62127ab8bd5505f3b57c0a2e 100644 (file)
--- a/folly/futures/test/ViaTest.cpp
+++ b/folly/futures/test/ViaTest.cpp
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/DrivableExecutor.h>
 #include <folly/Baton.h>
 #include <folly/MPMCQueue.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/DrivableExecutor.h>
 #include <folly/Baton.h>
 #include <folly/MPMCQueue.h>

+#include <folly/portability/GTest.h>

 
 #include <thread>
 
 
 #include <thread>
 

diff --git a/folly/futures/test/WaitTest.cpp b/folly/futures/test/WaitTest.cpp
index 816f48fecfee2927b4389258a556c03affaabf8a..380c13010b58d307c23bff5bf660a4e43e7a4feb 100644 (file)
--- a/folly/futures/test/WaitTest.cpp
+++ b/folly/futures/test/WaitTest.cpp
@@ -16,11 +16,10 @@
 
 #include <queue>
 
 
 #include <queue>
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/Baton.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using std::vector;
 
 using namespace folly;
 using std::vector;

diff --git a/folly/futures/test/WhenTest.cpp b/folly/futures/test/WhenTest.cpp
index bd8e076aa392d492fb103309f98ac15c038d3388..3563c428eb3c762882b66504678ae2511292d4af 100644 (file)
--- a/folly/futures/test/WhenTest.cpp
+++ b/folly/futures/test/WhenTest.cpp
@@ -17,11 +17,11 @@
 #include <memory>
 #include <mutex>
 
 #include <memory>
 #include <mutex>
 

-#include <gtest/gtest.h>

 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/WhileDoTest.cpp b/folly/futures/test/WhileDoTest.cpp
index 3c3fcc29475956e41f58924aa646c38fbb8d1054..15fdfbf3371f0099174b71c04ca873178f7e4523 100644 (file)
--- a/folly/futures/test/WhileDoTest.cpp
+++ b/folly/futures/test/WhileDoTest.cpp
@@ -18,11 +18,11 @@
 #include <mutex>
 #include <queue>
 
 #include <mutex>
 #include <queue>
 

-#include <gtest/gtest.h>

 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/WillEqualTest.cpp b/folly/futures/test/WillEqualTest.cpp
index a560ab56961f0aa32a536d872cf4e1f8724b5ef8..315210e50fdd46e37d70bcd1faf9eeb936675bcf 100644 (file)
--- a/folly/futures/test/WillEqualTest.cpp
+++ b/folly/futures/test/WillEqualTest.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/futures/Future.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/futures/test/WindowTest.cpp b/folly/futures/test/WindowTest.cpp
index 6eecedc199ef544d90155c475b04f447acb91ecf..f614c5fbe651e631e4acff01bf1fd4b9bf36475c 100644 (file)
--- a/folly/futures/test/WindowTest.cpp
+++ b/folly/futures/test/WindowTest.cpp
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <boost/thread/barrier.hpp>
 
 #include <folly/Conv.h>
 #include <folly/futures/Future.h>
 #include <boost/thread/barrier.hpp>
 
 #include <folly/Conv.h>
 #include <folly/futures/Future.h>

+#include <folly/portability/GTest.h>

 
 #include <vector>
 
 
 #include <vector>
 

diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp
index 66b987e445d0c9fb65960db9037f10996121181d..f779c4acb479e54c9d5cc483d07dedf23b5bd897 100644 (file)
--- a/folly/gen/test/BaseTest.cpp
+++ b/folly/gen/test/BaseTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <glog/logging.h>
  */
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+

 #include <iosfwd>
 #include <random>
 #include <set>
 #include <iosfwd>
 #include <random>
 #include <set>


@@ -28,6 +28,7 @@
 #include <folly/dynamic.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/dynamic.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::gen;
 using namespace folly;
 
 using namespace folly::gen;
 using namespace folly;

diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index b98bdf0cc7dd8c751d9246f17200ac2edbc4113a..3b89946e13274dc16f65f146d91b51c6a7e8770a 100644 (file)
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

-#include <gtest/gtest.h>

 #include <string>
 #include <vector>
 #include <tuple>
 #include <string>
 #include <vector>
 #include <tuple>


@@ -23,6 +22,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Combine.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Combine.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::gen;
 using namespace folly;
 
 using namespace folly::gen;
 using namespace folly;

diff --git a/folly/gen/test/FileTest.cpp b/folly/gen/test/FileTest.cpp
index a62f2edfdbc10e59818b4ed4c757e160ac612775..00c5635dc9e93da9e03e189a759346a41fb01b17 100644 (file)
--- a/folly/gen/test/FileTest.cpp
+++ b/folly/gen/test/FileTest.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

-#include <gtest/gtest.h>

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 


@@ -22,6 +21,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/File.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/File.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::gen;
 using namespace folly;
 
 using namespace folly::gen;
 using namespace folly;

diff --git a/folly/gen/test/ParallelMapTest.cpp b/folly/gen/test/ParallelMapTest.cpp
index 954a9f327248570878ba0dde3f7c38e623d014c7..503b027f0d153fce3c80f9765388d57539772625 100644 (file)
--- a/folly/gen/test/ParallelMapTest.cpp
+++ b/folly/gen/test/ParallelMapTest.cpp
@@ -17,11 +17,11 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Memory.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/ParallelMap.h>
 
 #include <folly/Memory.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/ParallelMap.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::gen;
 
 using namespace folly;
 using namespace folly::gen;

diff --git a/folly/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp
index ad4f60850cbccc9c4916ef5ff423d8314787b4a5..995eab0fef02c21049b514ee38460ccc19f4b1ea 100644 (file)
--- a/folly/gen/test/ParallelTest.cpp
+++ b/folly/gen/test/ParallelTest.cpp
@@ -15,12 +15,14 @@
  */
 
 #include <glog/logging.h>
  */
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+

 #include <iostream>
 #include <array>
 #include <vector>
 #include <iostream>
 #include <array>
 #include <vector>

+

 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::gen;
 
 using namespace folly;
 using namespace folly::gen;

diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp
index 65c79462013ec9053bbe8381f118bc1e5dc1221b..11f34b05f07d833eb377ce2e79a8e5e1e76117eb 100644 (file)
--- a/folly/gen/test/StringTest.cpp
+++ b/folly/gen/test/StringTest.cpp
@@ -15,12 +15,13 @@
  */
 
 #include <glog/logging.h>
  */
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+

 #include <iosfwd>
 #include <map>
 #include <vector>
 
 #include <folly/gen/String.h>
 #include <iosfwd>
 #include <map>
 #include <vector>
 
 #include <folly/gen/String.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::gen;
 using namespace folly;
 
 using namespace folly::gen;
 using namespace folly;

diff --git a/folly/io/async/ssl/test/SSLErrorsTest.cpp b/folly/io/async/ssl/test/SSLErrorsTest.cpp
index f651aceaaaf50bf6f521e5e51c40efeb512074ba..6643cf2e6883859e6634432f0aab5281f8c28465 100644 (file)
--- a/folly/io/async/ssl/test/SSLErrorsTest.cpp
+++ b/folly/io/async/ssl/test/SSLErrorsTest.cpp
@@ -16,7 +16,8 @@
 
 #include <folly/io/async/ssl/SSLErrors.h>
 
 
 #include <folly/io/async/ssl/SSLErrors.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+

 #include <openssl/err.h>
 #include <openssl/x509.h>
 
 #include <openssl/err.h>
 #include <openssl/x509.h>
 

diff --git a/folly/io/async/test/AsyncPipeTest.cpp b/folly/io/async/test/AsyncPipeTest.cpp
index 2a9c426f7cbb5eaf964c49a654fa21663c9d5d7e..81569dc5a137cfe1529a702d9e6c477e31dafcae 100644 (file)
--- a/folly/io/async/test/AsyncPipeTest.cpp
+++ b/folly/io/async/test/AsyncPipeTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/io/async/AsyncPipe.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/Memory.h>
 #include <folly/io/async/AsyncPipe.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/Memory.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 #include <fcntl.h>
 
 
 #include <fcntl.h>
 

diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp
index e5dbed11e1ff90bc2c49e710c07a9c9dbd76c2da..0920122930bbf15557ac6850bef01a41a95419fb 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest.cpp
@@ -22,6 +22,7 @@
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 


@@ -29,7 +30,6 @@
 
 #include <fcntl.h>
 #include <folly/io/Cursor.h>
 
 #include <fcntl.h>
 #include <folly/io/Cursor.h>

-#include <gtest/gtest.h>

 #include <openssl/bio.h>
 #include <sys/types.h>
 #include <fstream>
 #include <openssl/bio.h>
 #include <sys/types.h>
 #include <fstream>

diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h
index d9618098f3c4c54d417360809908cad76634505f..7ae4aeb5b0449b06a1e26ad64591904297a7fe76 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.h
+++ b/folly/io/async/test/AsyncSSLSocketTest.h
@@ -27,11 +27,11 @@
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ssl/SSLErrors.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 
 #include <fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 
 #include <fcntl.h>

-#include <gtest/gtest.h>

 #include <sys/types.h>
 #include <condition_variable>
 #include <iostream>
 #include <sys/types.h>
 #include <condition_variable>
 #include <iostream>

diff --git a/folly/io/async/test/AsyncSSLSocketTest2.cpp b/folly/io/async/test/AsyncSSLSocketTest2.cpp
index e39f3b73585cd588eeea1b9b510ef77356349ab6..e33df0a127550dae7a6a91c7ab52faaf415d717e 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest2.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest2.cpp
@@ -15,12 +15,12 @@
  */
 #include <folly/io/async/test/AsyncSSLSocketTest.h>
 
  */
 #include <folly/io/async/test/AsyncSSLSocketTest.h>
 

-#include <gtest/gtest.h>

 #include <pthread.h>
 
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/SSLContext.h>
 #include <pthread.h>
 
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/SSLContext.h>

+#include <folly/portability/GTest.h>

 
 using std::string;
 using std::vector;
 
 using std::string;
 using std::vector;

diff --git a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
index 13270a69ab44533b81ed4eec749f912613c3bd5b..9b67ba3ce8fd98b54921e12be7e2090dffc26f2f 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
@@ -19,8 +19,8 @@
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

diff --git a/folly/io/async/test/AsyncSocketExceptionTest.cpp b/folly/io/async/test/AsyncSocketExceptionTest.cpp
index 50c665990ec889fd9248e0f31c3268ddbeb51555..d3c25d1af96fba7ee50b1053080bddfe9c075af0 100644 (file)
--- a/folly/io/async/test/AsyncSocketExceptionTest.cpp
+++ b/folly/io/async/test/AsyncSocketExceptionTest.cpp
@@ -17,7 +17,8 @@
 
 #include <folly/io/async/AsyncSocketException.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 
 #include <folly/io/async/AsyncSocketException.h>
 #include <folly/io/async/ssl/SSLErrors.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+

 #include <openssl/ssl.h>
 
 using namespace testing;
 #include <openssl/ssl.h>
 
 using namespace testing;

diff --git a/folly/io/async/test/AsyncSocketTest.cpp b/folly/io/async/test/AsyncSocketTest.cpp
index bd348bd9c446a28b7f6829d7da0b0e74b862c662..261f6f2e549e9bfc4690824a4d5bb23a85567fda 100644 (file)
--- a/folly/io/async/test/AsyncSocketTest.cpp
+++ b/folly/io/async/test/AsyncSocketTest.cpp
@@ -18,8 +18,7 @@
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncServerSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncServerSocket.h>
 #include <folly/io/async/EventBase.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/io/async/test/AsyncSocketTest2.cpp b/folly/io/async/test/AsyncSocketTest2.cpp
index bc27b24141f9f9716032c97830f53426014bf80e..afd4f9e0b3628119f6d228483a184ae7d2a0797e 100644 (file)
--- a/folly/io/async/test/AsyncSocketTest2.cpp
+++ b/folly/io/async/test/AsyncSocketTest2.cpp
@@ -26,13 +26,13 @@
 #include <folly/io/async/test/AsyncSocketTest.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/portability/GMock.h>
 #include <folly/io/async/test/AsyncSocketTest.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 #include <folly/test/SocketAddressTestHelper.h>
 
 #include <boost/scoped_array.hpp>
 #include <fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 #include <folly/test/SocketAddressTestHelper.h>
 
 #include <boost/scoped_array.hpp>
 #include <fcntl.h>

-#include <gtest/gtest.h>

 #include <sys/types.h>
 #include <iostream>
 #include <thread>
 #include <sys/types.h>
 #include <iostream>
 #include <thread>

diff --git a/folly/io/async/test/AsyncTimeoutTest.cpp b/folly/io/async/test/AsyncTimeoutTest.cpp
index 18592b788e94913981f062e24a7861d280476360..463fb3ab018245e5de1b9e87556b96807e9d6e57 100644 (file)
--- a/folly/io/async/test/AsyncTimeoutTest.cpp
+++ b/folly/io/async/test/AsyncTimeoutTest.cpp
@@ -16,8 +16,7 @@
 
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/EventBase.h>
 
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/EventBase.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/io/async/test/AsyncTransportTest.cpp b/folly/io/async/test/AsyncTransportTest.cpp
index 8a7f525ba6d528a8616bb445545612d5fc8f95b2..815ba7f2f13041717825dc0694b1e90ddf962b8a 100644 (file)
--- a/folly/io/async/test/AsyncTransportTest.cpp
+++ b/folly/io/async/test/AsyncTransportTest.cpp
@@ -17,8 +17,7 @@
 #include <folly/io/async/AsyncSocket.h>
 
 #include <folly/io/async/test/MockAsyncTransport.h>
 #include <folly/io/async/AsyncSocket.h>
 
 #include <folly/io/async/test/MockAsyncTransport.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace testing;
 
 
 using namespace testing;
 

diff --git a/folly/io/async/test/AsyncUDPSocketTest.cpp b/folly/io/async/test/AsyncUDPSocketTest.cpp
index 27ac844b047c655ef719e16dd6bace02e5da2b8e..acaf76b47cb2bb97e69a69d55a0decb58b05659b 100644 (file)
--- a/folly/io/async/test/AsyncUDPSocketTest.cpp
+++ b/folly/io/async/test/AsyncUDPSocketTest.cpp
@@ -23,11 +23,10 @@
 #include <boost/thread/barrier.hpp>
 
 #include <folly/io/IOBuf.h>
 #include <boost/thread/barrier.hpp>
 
 #include <folly/io/IOBuf.h>

+#include <folly/portability/GTest.h>

 
 #include <thread>
 
 
 #include <thread>
 

-#include <gtest/gtest.h>
-

 using folly::AsyncUDPSocket;
 using folly::AsyncUDPServerSocket;
 using folly::AsyncTimeout;
 using folly::AsyncUDPSocket;
 using folly::AsyncUDPServerSocket;
 using folly::AsyncTimeout;

diff --git a/folly/io/async/test/DelayedDestructionBaseTest.cpp b/folly/io/async/test/DelayedDestructionBaseTest.cpp
index 1d7ab3fc20129d14108df8192fd50da225f386b2..580b2e52571ece1576b0591665f34daf22177bc7 100644 (file)
--- a/folly/io/async/test/DelayedDestructionBaseTest.cpp
+++ b/folly/io/async/test/DelayedDestructionBaseTest.cpp
@@ -34,10 +34,11 @@
 #include <folly/io/async/DelayedDestructionBase.h>
 
 #include <functional>
 #include <folly/io/async/DelayedDestructionBase.h>
 
 #include <functional>

-#include <gtest/gtest.h>

 #include <list>
 #include <vector>
 
 #include <list>
 #include <vector>
 

+#include <folly/portability/GTest.h>
+

 using namespace folly;
 
 class DestructionOnCallback : public DelayedDestructionBase {
 using namespace folly;
 
 class DestructionOnCallback : public DelayedDestructionBase {

diff --git a/folly/io/async/test/DelayedDestructionTest.cpp b/folly/io/async/test/DelayedDestructionTest.cpp
index e4a3e1bb073259de0ceda6fb4e99f9d2d0ba622e..d7836b9e781e6f57e1c9d0e1b0bb5b33f1eee0dd 100644 (file)
--- a/folly/io/async/test/DelayedDestructionTest.cpp
+++ b/folly/io/async/test/DelayedDestructionTest.cpp
@@ -15,7 +15,7 @@
  */
 #include <folly/io/async/DelayedDestruction.h>
 
  */
 #include <folly/io/async/DelayedDestruction.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/io/async/test/EventBaseLocalTest.cpp b/folly/io/async/test/EventBaseLocalTest.cpp
index 4d570ad0dd3767011d3dc71f2b6c20967f428b2f..50b5ecd83f1b11f00131be7e53436bee5308369c 100644 (file)
--- a/folly/io/async/test/EventBaseLocalTest.cpp
+++ b/folly/io/async/test/EventBaseLocalTest.cpp
@@ -34,7 +34,7 @@
 
 #include <folly/io/async/EventBaseLocal.h>
 #include <folly/io/async/test/Util.h>
 
 #include <folly/io/async/EventBaseLocal.h>
 #include <folly/io/async/test/Util.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 struct Foo {
   Foo(int n, std::function<void()> dtorFn):
 
 struct Foo {
   Foo(int n, std::function<void()> dtorFn):

diff --git a/folly/io/async/test/EventHandlerTest.cpp b/folly/io/async/test/EventHandlerTest.cpp
index 255f2140183845862972d1b9eae2e8d1cfd2af91..0c3e80c8926f06a5264fcfdcefdce34b0ba45400 100644 (file)
--- a/folly/io/async/test/EventHandlerTest.cpp
+++ b/folly/io/async/test/EventHandlerTest.cpp
@@ -23,8 +23,8 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventHandler.h>
 #include <folly/portability/GMock.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventHandler.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 #include <folly/portability/Sockets.h>

-#include <gtest/gtest.h>

 #include <sys/eventfd.h>
 
 using namespace std;
 #include <sys/eventfd.h>
 
 using namespace std;

diff --git a/folly/io/async/test/HHWheelTimerSlowTests.cpp b/folly/io/async/test/HHWheelTimerSlowTests.cpp
index 20a40cf65a6093e649cb78e23b9e732e3b03b4da..3c412fb092f5b1798e0a24b59a5419f340448800 100644 (file)
--- a/folly/io/async/test/HHWheelTimerSlowTests.cpp
+++ b/folly/io/async/test/HHWheelTimerSlowTests.cpp
@@ -18,8 +18,8 @@
 #include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <thread>
 #include <vector>
 
 #include <thread>
 #include <vector>
 

diff --git a/folly/io/async/test/HHWheelTimerTest.cpp b/folly/io/async/test/HHWheelTimerTest.cpp
index 0ee82125e22fe7d1cbc18a7ea7fa330a4441d993..d265f34ff582638dbae991658aa9b299c60025aa 100644 (file)
--- a/folly/io/async/test/HHWheelTimerTest.cpp
+++ b/folly/io/async/test/HHWheelTimerTest.cpp
@@ -20,8 +20,8 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <vector>
 
 using namespace folly;
 #include <vector>
 
 using namespace folly;

diff --git a/folly/io/async/test/NotificationQueueTest.cpp b/folly/io/async/test/NotificationQueueTest.cpp
index c24e6842d2debf3f389b4a76cd44731a3d796718..bd7a54a45cc8f199317aff723885b8a165316260 100644 (file)
--- a/folly/io/async/test/NotificationQueueTest.cpp
+++ b/folly/io/async/test/NotificationQueueTest.cpp
@@ -18,6 +18,8 @@
 #include <folly/io/async/ScopedEventBaseThread.h>
 
 #include <folly/Baton.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
 
 #include <folly/Baton.h>

+#include <folly/portability/GTest.h>
+

 #include <list>
 #include <iostream>
 #include <thread>
 #include <list>
 #include <iostream>
 #include <thread>


@@ -27,8 +29,6 @@
 #include <sys/wait.h>
 #endif
 
 #include <sys/wait.h>
 #endif
 

-#include <gtest/gtest.h>
-

 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;
 

diff --git a/folly/io/async/test/RequestContextTest.cpp b/folly/io/async/test/RequestContextTest.cpp
index 1f5c5e61f671c76035e34e2bfa5bbdbbb060464d..0ca773c3caeb33126e779aaff5577dfdea05196f 100644 (file)
--- a/folly/io/async/test/RequestContextTest.cpp
+++ b/folly/io/async/test/RequestContextTest.cpp
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
  * specific language governing permissions and limitations
  * under the License.
  */

-#include <gtest/gtest.h>

 #include <thread>
 
 #include <folly/Memory.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/Request.h>
 #include <thread>
 
 #include <folly/Memory.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/Request.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/io/async/test/ScopedEventBaseThreadTest.cpp b/folly/io/async/test/ScopedEventBaseThreadTest.cpp
index 81589cb7e442bdb199c9293f84c615bb27c407bb..9d92ea838a25443f4314c030a1f484be85b28a30 100644 (file)
--- a/folly/io/async/test/ScopedEventBaseThreadTest.cpp
+++ b/folly/io/async/test/ScopedEventBaseThreadTest.cpp
@@ -18,8 +18,7 @@
 
 #include <chrono>
 #include <folly/Baton.h>
 
 #include <chrono>
 #include <folly/Baton.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace std::chrono;
 
 using namespace std;
 using namespace std::chrono;

diff --git a/folly/io/async/test/Util.h b/folly/io/async/test/Util.h
index 8f54274de4e4007ae7e9602211bf4f227b661519..02d0670f5eb79f436c4977cd62d10a0c07391dd9 100644 (file)
--- a/folly/io/async/test/Util.h
+++ b/folly/io/async/test/Util.h
@@ -20,7 +20,7 @@
 
 #include <folly/io/async/test/TimeUtil.h>
 #include <folly/test/TestUtils.h>
 
 #include <folly/io/async/test/TimeUtil.h>
 #include <folly/test/TestUtils.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 /**
  * Check how long a timeout took to fire.
 
 /**
  * Check how long a timeout took to fire.

diff --git a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
index 0baac5186781611b2346ff3c67f17b0f9da5cc00..e75a9318308afc9a58d1789f8f37637246e0a311 100644 (file)
--- a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
+++ b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

-#include <gtest/gtest.h>

 
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/WriteChainAsyncTransportWrapper.h>
 #include <folly/portability/GMock.h>
 
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/WriteChainAsyncTransportWrapper.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 
 using namespace testing;
 using testing::_;
 
 using namespace testing;
 using testing::_;

diff --git a/folly/io/test/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp
index d0d35af28a2de03ff9457cbf684baca29aef07e5..7de76177e9f4fe95218ecbd86d42300fef6c547f 100644 (file)
--- a/folly/io/test/CompressionTest.cpp
+++ b/folly/io/test/CompressionTest.cpp
@@ -22,13 +22,13 @@
 
 #include <boost/noncopyable.hpp>
 #include <glog/logging.h>
 
 #include <boost/noncopyable.hpp>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/Random.h>
 #include <folly/Varint.h>
 #include <folly/io/IOBufQueue.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/Random.h>
 #include <folly/Varint.h>
 #include <folly/io/IOBufQueue.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace io { namespace test {
 
 
 namespace folly { namespace io { namespace test {
 

diff --git a/folly/io/test/IOBufCursorTest.cpp b/folly/io/test/IOBufCursorTest.cpp
index 08cb23d44eba9fabe18a31ec90dcdccc09f486a9..5c607ad20a93497ba9f453b09ecdd91260c07e3d 100644 (file)
--- a/folly/io/test/IOBufCursorTest.cpp
+++ b/folly/io/test/IOBufCursorTest.cpp
@@ -19,8 +19,7 @@
 #include <folly/Format.h>
 #include <folly/Range.h>
 #include <folly/io/Cursor.h>
 #include <folly/Format.h>
 #include <folly/Range.h>
 #include <folly/io/Cursor.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::ByteRange;
 using folly::format;
 
 using folly::ByteRange;
 using folly::format;

diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index 26062185da1f8a3e71445e415f5583ee9817bf7e..737c4bf4109d1913571bd0c39093b3c63947924f 100644 (file)
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -20,9 +20,8 @@
 #include <stdexcept>
 #include <string.h>
 
 #include <stdexcept>
 #include <string.h>
 

-#include <gtest/gtest.h>
-

 #include <folly/Range.h>
 #include <folly/Range.h>

+#include <folly/portability/GTest.h>

 
 using folly::IOBuf;
 using folly::IOBufQueue;
 
 using folly::IOBuf;
 using folly::IOBufQueue;

diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
index c012debdf16037416806b0cd2fb69c67fe614386..a615496c1d8e9a9abaedb5fde82d3a2cba23d374 100644 (file)
--- a/folly/io/test/IOBufTest.cpp
+++ b/folly/io/test/IOBufTest.cpp
@@ -20,10 +20,10 @@
 #include <cstddef>
 
 #include <boost/random.hpp>
 #include <cstddef>
 
 #include <boost/random.hpp>

-#include <gtest/gtest.h>

 
 #include <folly/Malloc.h>
 #include <folly/Range.h>
 
 #include <folly/Malloc.h>
 #include <folly/Range.h>

+#include <folly/portability/GTest.h>

 
 using folly::fbstring;
 using folly::fbvector;
 
 using folly::fbstring;
 using folly::fbvector;

diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index 9154b8ac9111880d7d323a4d0b646199ea34b631..79985b5b92ee3b9f34ae6c97559f09783e90334b 100644 (file)
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -21,7 +21,6 @@
 #include <random>
 
 #include <glog/logging.h>
 #include <random>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Conv.h>
 #include <folly/FBString.h>
 
 #include <folly/Conv.h>
 #include <folly/FBString.h>


@@ -29,6 +28,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/portability/GFlags.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");

diff --git a/folly/io/test/ShutdownSocketSetTest.cpp b/folly/io/test/ShutdownSocketSetTest.cpp
index 0b1e1443e253c7d999f154f1a2efce3382106c4b..1ddebdb8c3b72ccb7f0064663633d005f124f68d 100644 (file)
--- a/folly/io/test/ShutdownSocketSetTest.cpp
+++ b/folly/io/test/ShutdownSocketSetTest.cpp
@@ -20,8 +20,8 @@
 #include <thread>
 
 #include <glog/logging.h>
 #include <thread>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 
 using folly::ShutdownSocketSet;
 #include <folly/portability/Sockets.h>
 
 using folly::ShutdownSocketSet;

diff --git a/folly/portability/test/ConstexprTest.cpp b/folly/portability/test/ConstexprTest.cpp
index 1bf74382cdc1623fcff246495bdfe602a342bf39..37f5132cc68ed4e91dcf3d891f8a47dadd21afe3 100644 (file)
--- a/folly/portability/test/ConstexprTest.cpp
+++ b/folly/portability/test/ConstexprTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/portability/Constexpr.h>
 
 
 #include <folly/portability/Constexpr.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace {
 
 
 namespace {
 

diff --git a/folly/portability/test/LibgenTest.cpp b/folly/portability/test/LibgenTest.cpp
index 9d258a58e27e88a59083b85e3551d6218b986a62..737f1bf29a681ff7343252a9b2ff0d80cfe1d3ac 100755 (executable)
--- a/folly/portability/test/LibgenTest.cpp
+++ b/folly/portability/test/LibgenTest.cpp
@@ -16,8 +16,7 @@
 
 #include <string>
 
 
 #include <string>
 

-#include <gtest/gtest.h>
-
+#include <folly/portability/GTest.h>

 #include <folly/portability/Libgen.h>
 
 TEST(Libgen, dirname) {
 #include <folly/portability/Libgen.h>
 
 TEST(Libgen, dirname) {

diff --git a/folly/portability/test/TimeTest.cpp b/folly/portability/test/TimeTest.cpp
index 83ecc0c23a6c1db3baeb2e6b62353e1e5662574e..0df8f2b9ce4b55cd1a467b6ea662bfc36c2198d1 100644 (file)
--- a/folly/portability/test/TimeTest.cpp
+++ b/folly/portability/test/TimeTest.cpp
@@ -17,11 +17,10 @@
 #include <folly/portability/Time.h>
 
 #include <folly/test/TestUtils.h>
 #include <folly/portability/Time.h>
 
 #include <folly/test/TestUtils.h>

+#include <folly/portability/GTest.h>

 
 #include <chrono>
 
 
 #include <chrono>
 

-#include <gtest/gtest.h>
-

 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;

diff --git a/folly/ssl/test/OpenSSLHashTest.cpp b/folly/ssl/test/OpenSSLHashTest.cpp
index 129cf406bef149a65a047a09d182fa0a464588f9..1e2c9e6a5299368265913b22cfa241d1ae9e3811 100644 (file)
--- a/folly/ssl/test/OpenSSLHashTest.cpp
+++ b/folly/ssl/test/OpenSSLHashTest.cpp
@@ -16,9 +16,8 @@
 
 #include <folly/ssl/OpenSSLHash.h>
 
 
 #include <folly/ssl/OpenSSLHash.h>
 

-#include <gtest/gtest.h>
-

 #include <folly/io/IOBufQueue.h>
 #include <folly/io/IOBufQueue.h>

+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/AHMIntStressTest.cpp b/folly/test/AHMIntStressTest.cpp
index 7fc6251c4129debc84857605726b99c15a0bcbb7..dbe7d953829c745f422c511b73136e866689f9c6 100644 (file)
--- a/folly/test/AHMIntStressTest.cpp
+++ b/folly/test/AHMIntStressTest.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <thread>
 #include <memory>
 #include <mutex>
 #include <thread>
 #include <memory>
 #include <mutex>


@@ -23,6 +21,7 @@
 #include <folly/AtomicHashMap.h>
 #include <folly/ScopeGuard.h>
 #include <folly/Memory.h>
 #include <folly/AtomicHashMap.h>
 #include <folly/ScopeGuard.h>
 #include <folly/Memory.h>

+#include <folly/portability/GTest.h>

 
 namespace {
 
 
 namespace {
 

diff --git a/folly/test/ApplyTupleTest.cpp b/folly/test/ApplyTupleTest.cpp
index e29c9914759c5dbc2d29d25604448e8331e9180b..8aff7d07b11dd7eb056d585e77da17b850cb43f6 100644 (file)
--- a/folly/test/ApplyTupleTest.cpp
+++ b/folly/test/ApplyTupleTest.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <folly/ApplyTuple.h>
 #include <iostream>
 
 #include <folly/ApplyTuple.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 #include <array>
 #include <memory>
 
 #include <array>
 #include <memory>

diff --git a/folly/test/ArenaSmartPtrTest.cpp b/folly/test/ArenaSmartPtrTest.cpp
index e49d270922e028045c08fbe6e5afac3a90e17008..1ac482de87555d7ca82ba7979899730fc2451835 100644 (file)
--- a/folly/test/ArenaSmartPtrTest.cpp
+++ b/folly/test/ArenaSmartPtrTest.cpp
@@ -20,8 +20,7 @@
 
 #include <folly/Memory.h>
 #include <folly/Arena.h>
 
 #include <folly/Memory.h>
 #include <folly/Arena.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ArenaTest.cpp b/folly/test/ArenaTest.cpp
index 93d74e8701f5ff1363176aaf3b9f5049b39e2b85..b754f970eec3183ae7716cd7166f57cdd21f4ee7 100644 (file)
--- a/folly/test/ArenaTest.cpp
+++ b/folly/test/ArenaTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/Arena.h>
 #include <folly/Memory.h>
 
 #include <folly/Arena.h>
 #include <folly/Memory.h>

+#include <folly/portability/GTest.h>

 
 #include <set>
 #include <vector>
 
 #include <glog/logging.h>
 
 #include <set>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ArrayTest.cpp b/folly/test/ArrayTest.cpp
index 2bfc73a8f51a55a4b237e8e413f49c72a344eb14..c50270dff2e1c93b71e00a11ea59ff151a7d07ef 100644 (file)
--- a/folly/test/ArrayTest.cpp
+++ b/folly/test/ArrayTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <folly/Array.h>
  * limitations under the License.
  */
 #include <folly/Array.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 #include <string>
 
 using namespace std;
 #include <string>
 
 using namespace std;

diff --git a/folly/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp
index ec7f078fde40be1ec384b8913c3c7c90316c9a8f..86ebd7bc979b1c31cb6e5ff2b5947a55bb0b6aca 100644 (file)
--- a/folly/test/AsciiCaseInsensitiveTest.cpp
+++ b/folly/test/AsciiCaseInsensitiveTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/Range.h>
 
 #include <folly/portability/GFlags.h>
 #include <folly/Range.h>
 
 #include <folly/portability/GFlags.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 #include <algorithm>
 
 using namespace std;
 #include <algorithm>
 
 using namespace std;

diff --git a/folly/test/AtomicBitSetTest.cpp b/folly/test/AtomicBitSetTest.cpp
index 3823ad2bb5bed20dfaaf3da897f5c190daf56d46..57c50beb8023ad18afe39027f782f879e4622347 100644 (file)
--- a/folly/test/AtomicBitSetTest.cpp
+++ b/folly/test/AtomicBitSetTest.cpp
@@ -16,8 +16,9 @@
 
 #include <folly/AtomicBitSet.h>
 
 
 #include <folly/AtomicBitSet.h>
 

+#include <folly/portability/GTest.h>
+

 #include <glog/logging.h>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/test/AtomicHashArrayTest.cpp b/folly/test/AtomicHashArrayTest.cpp
index 9e53635e09d17adc0346b5dbc20809925f2ba78e..b6b9e9a5ebd132e6df66974a22aae07c8d44f693 100644 (file)
--- a/folly/test/AtomicHashArrayTest.cpp
+++ b/folly/test/AtomicHashArrayTest.cpp
@@ -23,7 +23,7 @@
 #include <folly/Hash.h>
 #include <folly/Memory.h>
 #include <folly/portability/SysMman.h>
 #include <folly/Hash.h>
 #include <folly/Memory.h>
 #include <folly/portability/SysMman.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index 32ad64d0b2e92425ab08898c75864f61ed77c4cf..c39553952cb27b6cc7bbda1b79ffa07749a267fc 100644 (file)
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -17,7 +17,6 @@
 #include <folly/AtomicHashMap.h>
 
 #include <glog/logging.h>
 #include <folly/AtomicHashMap.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 #include <thread>
 #include <atomic>
 #include <memory>
 #include <thread>
 #include <atomic>
 #include <memory>


@@ -26,6 +25,7 @@
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>
 #include <folly/portability/Atomic.h>
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>
 #include <folly/portability/Atomic.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/SysTime.h>
 
 using std::vector;
 #include <folly/portability/SysTime.h>
 
 using std::vector;

diff --git a/folly/test/AtomicLinkedListTest.cpp b/folly/test/AtomicLinkedListTest.cpp
index b13c24c9ca28393fa4de6951003ca5f9abc8955a..ad09e12f36acd6d780dc4219f032b9ba0af2dd82 100644 (file)
--- a/folly/test/AtomicLinkedListTest.cpp
+++ b/folly/test/AtomicLinkedListTest.cpp
@@ -17,9 +17,8 @@
 #include <algorithm>
 #include <thread>
 
 #include <algorithm>
 #include <thread>
 

-#include <gtest/gtest.h>
-

 #include <folly/AtomicLinkedList.h>
 #include <folly/AtomicLinkedList.h>

+#include <folly/portability/GTest.h>

 
 class TestIntrusiveObject {
  public:
 
 class TestIntrusiveObject {
  public:

diff --git a/folly/test/AtomicStructTest.cpp b/folly/test/AtomicStructTest.cpp
index b6d0a07499a941f2c3fce65c3be7b395608aabf3..554722e0b56597fc000018a3d99918ee61eda54e 100644 (file)
--- a/folly/test/AtomicStructTest.cpp
+++ b/folly/test/AtomicStructTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/AtomicStruct.h>
 
 
 #include <folly/AtomicStruct.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/AtomicUnorderedMapTest.cpp b/folly/test/AtomicUnorderedMapTest.cpp
index c9c4238433786260838e31d54447d615643aa704..e1a0104c5f3ca643b1f879a6c4bb255608a2bb31 100644 (file)
--- a/folly/test/AtomicUnorderedMapTest.cpp
+++ b/folly/test/AtomicUnorderedMapTest.cpp
@@ -20,10 +20,9 @@
 #include <thread>
 #include <unordered_map>
 
 #include <thread>
 #include <unordered_map>
 

-#include <gtest/gtest.h>
-

 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;

diff --git a/folly/test/BatonBenchmark.cpp b/folly/test/BatonBenchmark.cpp
index 099226a86a90a046e4c60e727aa69819439886bd..b261ac945b4e022308e38d1123b81b302a2f4960 100644 (file)
--- a/folly/test/BatonBenchmark.cpp
+++ b/folly/test/BatonBenchmark.cpp
@@ -19,10 +19,9 @@
 #include <semaphore.h>
 #include <thread>
 
 #include <semaphore.h>
 #include <thread>
 

-#include <gtest/gtest.h>
-

 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>
 
 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>
 

diff --git a/folly/test/BatonTest.cpp b/folly/test/BatonTest.cpp
index eaeb5ad69a2c768ab4624fb08cb11d03d05b7547..4fbc6959149527e7030fc21f4a14be10ec8226e6 100644 (file)
--- a/folly/test/BatonTest.cpp
+++ b/folly/test/BatonTest.cpp
@@ -17,9 +17,10 @@
 #include <folly/Baton.h>
 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>
 #include <folly/Baton.h>
 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>

+#include <folly/portability/GTest.h>
+

 #include <thread>
 #include <semaphore.h>
 #include <thread>
 #include <semaphore.h>

-#include <gtest/gtest.h>

 
 using namespace folly;
 using namespace folly::test;
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/test/BatonTestHelpers.h b/folly/test/BatonTestHelpers.h
index 0d86b361240faf17368d298522a4bc0b4659d0da..7efbd3e9cf89a87f25f151126a5f3585691ba2a9 100644 (file)
--- a/folly/test/BatonTestHelpers.h
+++ b/folly/test/BatonTestHelpers.h
@@ -18,8 +18,7 @@
 
 #include <folly/Baton.h>
 #include <folly/test/DeterministicSchedule.h>
 
 #include <folly/Baton.h>
 #include <folly/test/DeterministicSchedule.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace folly {
 namespace test {
 
 namespace folly {
 namespace test {

diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index fdf49b219c62f260090f4819565d02be8550fe7e..f9b2b1d8e25a05f9baace3d8e6adba01b6a819bb 100644 (file)
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -21,10 +21,9 @@
 #include <limits>
 #include <vector>
 
 #include <limits>
 #include <vector>
 

-#include <gtest/gtest.h>
-

 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::bititerator_detail;
 
 using namespace folly;
 using namespace folly::bititerator_detail;

diff --git a/folly/test/BitsTest.cpp b/folly/test/BitsTest.cpp
index 2b2a140102374189a24791bca7916b4e81208949..4f6ed6764e5a8ae6f6086a3c2b2407329467e8ab 100644 (file)
--- a/folly/test/BitsTest.cpp
+++ b/folly/test/BitsTest.cpp
@@ -18,7 +18,7 @@
 
 #include <folly/Bits.h>
 
 
 #include <folly/Bits.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/CacheLocalityTest.cpp b/folly/test/CacheLocalityTest.cpp
index 33af739bd626c916702e881310553b596f11c292..dd46e79bc1ff067bef13511c08842125c1b25579 100644 (file)
--- a/folly/test/CacheLocalityTest.cpp
+++ b/folly/test/CacheLocalityTest.cpp
@@ -16,13 +16,14 @@
 
 #include <folly/detail/CacheLocality.h>
 
 
 #include <folly/detail/CacheLocality.h>
 

+#include <folly/portability/GTest.h>
+

 #include <sched.h>
 #include <memory>
 #include <thread>
 #include <type_traits>
 #include <unordered_map>
 #include <glog/logging.h>
 #include <sched.h>
 #include <memory>
 #include <thread>
 #include <type_traits>
 #include <unordered_map>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 using namespace folly::detail;
 
 
 using namespace folly::detail;
 

diff --git a/folly/test/CachelinePaddedTest.cpp b/folly/test/CachelinePaddedTest.cpp
index 9eca058ab31a9d2d68e9c31eeaf3d85b6e8ebb07..c67c3161d7b635f70a56360f3c1ce9cc0455266c 100644 (file)
--- a/folly/test/CachelinePaddedTest.cpp
+++ b/folly/test/CachelinePaddedTest.cpp
@@ -18,7 +18,7 @@
 
 #include <type_traits>
 
 
 #include <type_traits>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::CachelinePadded;
 
 
 using folly::CachelinePadded;
 

diff --git a/folly/test/CallOnceTest.cpp b/folly/test/CallOnceTest.cpp
index 4a4b291df4150fcdde6c71b10939d778608b168c..843fa481978b332128d2296b1878c375109eab37 100644 (file)
--- a/folly/test/CallOnceTest.cpp
+++ b/folly/test/CallOnceTest.cpp
@@ -20,9 +20,9 @@
 
 #include <folly/CallOnce.h>
 #include <folly/portability/GFlags.h>
 
 #include <folly/CallOnce.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 #include <glog/logging.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 DEFINE_int32(threads, 16, "benchmark concurrency");
 
 
 DEFINE_int32(threads, 16, "benchmark concurrency");
 

diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index a82bf75e88757e68c0d23e495db1c4db86d8a739..3e93e9f3b3e4562cc3ef8996030917df52750cc3 100644 (file)
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/Checksum.h>
 
 
 #include <folly/Checksum.h>
 

-#include <gtest/gtest.h>

 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>
 #include <folly/portability/GFlags.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 namespace {
 const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t);
 
 namespace {
 const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t);

diff --git a/folly/test/ClockGettimeWrappersTest.cpp b/folly/test/ClockGettimeWrappersTest.cpp
index 8516d6d982ce979f8358f438f209919e00fdeee4..4d1950a739ded422b18eed4fc32b32cfb2f2a15e 100644 (file)
--- a/folly/test/ClockGettimeWrappersTest.cpp
+++ b/folly/test/ClockGettimeWrappersTest.cpp
@@ -17,11 +17,10 @@
 #include <folly/ClockGettimeWrappers.h>
 
 #include <folly/test/TestUtils.h>
 #include <folly/ClockGettimeWrappers.h>
 
 #include <folly/test/TestUtils.h>

+#include <folly/portability/GTest.h>

 
 #include <chrono>
 
 
 #include <chrono>
 

-#include <gtest/gtest.h>
-

 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;

diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index b63be004181fdb560ea458f2a578755ba1d2508c..cdd72ac02d9e18e09d8ace1dcd0eaf8584686442 100644 (file)
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -26,13 +26,13 @@
 #include <system_error>
 
 #include <glog/logging.h>
 #include <system_error>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Arena.h>
 #include <folly/Foreach.h>
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <folly/portability/GFlags.h>
 
 #include <folly/Arena.h>
 #include <folly/Foreach.h>
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
 
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
 

diff --git a/folly/test/ContainerTraitsTest.cpp b/folly/test/ContainerTraitsTest.cpp
index d3894e3a4625d97e9d7d0d12f5249f28ca396f6f..4ca5a81836de8285372112f3f0fd60fac39071fb 100644 (file)
--- a/folly/test/ContainerTraitsTest.cpp
+++ b/folly/test/ContainerTraitsTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/ContainerTraits.h>
 
 
 #include <folly/ContainerTraits.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/ConvTest.cpp b/folly/test/ConvTest.cpp
index fd26293e4965ead7d7abb4c0002b1174d65c1872..878171a28e8ac0e1384c0307d5dd3965e35be418 100644 (file)
--- a/folly/test/ConvTest.cpp
+++ b/folly/test/ConvTest.cpp
@@ -19,9 +19,11 @@
 #endif
 
 #include <boost/lexical_cast.hpp>
 #endif
 
 #include <boost/lexical_cast.hpp>

+

 #include <folly/Conv.h>
 #include <folly/Foreach.h>
 #include <folly/Conv.h>
 #include <folly/Foreach.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+

 #include <algorithm>
 #include <cinttypes>
 #include <limits>
 #include <algorithm>
 #include <cinttypes>
 #include <limits>

diff --git a/folly/test/CpuIdTest.cpp b/folly/test/CpuIdTest.cpp
index 28c43e79de70717d3592b4653f0359626b60428c..c1465aa40ed05653eb75a35fe4e631ecf0608fad 100644 (file)
--- a/folly/test/CpuIdTest.cpp
+++ b/folly/test/CpuIdTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/CpuId.h>
 
 
 #include <folly/CpuId.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/DemangleTest.cpp b/folly/test/DemangleTest.cpp
index 1316319f7ec274cd7655da5144b88a137fcdf09f..78c99331cf5d4f370b7588c064b1138a293af09a 100644 (file)
--- a/folly/test/DemangleTest.cpp
+++ b/folly/test/DemangleTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Demangle.h>
 
 
 #include <folly/Demangle.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::demangle;
 
 
 using folly::demangle;
 

diff --git a/folly/test/DeterministicScheduleTest.cpp b/folly/test/DeterministicScheduleTest.cpp
index db22703b4a842731ccd4f2c8d0e23cd2308a9d9e..7153f2b526493baff752028dc8aec9c3f0735e84 100644 (file)
--- a/folly/test/DeterministicScheduleTest.cpp
+++ b/folly/test/DeterministicScheduleTest.cpp
@@ -16,9 +16,8 @@
 
 #include <folly/test/DeterministicSchedule.h>
 
 
 #include <folly/test/DeterministicSchedule.h>
 

-#include <gtest/gtest.h>
-

 #include <folly/portability/GFlags.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::test;
 
 
 using namespace folly::test;
 

diff --git a/folly/test/DiscriminatedPtrTest.cpp b/folly/test/DiscriminatedPtrTest.cpp
index 916b7943247f8ad5cc526a55a48e4ba5c2dfbfcf..338621d9d6301f6425791e8a870ed53f5abe87c2 100644 (file)
--- a/folly/test/DiscriminatedPtrTest.cpp
+++ b/folly/test/DiscriminatedPtrTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/DiscriminatedPtr.h>
 
 
 #include <folly/DiscriminatedPtr.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/DynamicConverterTest.cpp b/folly/test/DynamicConverterTest.cpp
index 1d45e67d787ad2ec9a5525c21599e47bb28a62c8..942f6b2727593ebdcd959c7c371490d29be0c295 100644 (file)
--- a/folly/test/DynamicConverterTest.cpp
+++ b/folly/test/DynamicConverterTest.cpp
@@ -18,8 +18,9 @@
 
 #include <folly/DynamicConverter.h>
 
 
 #include <folly/DynamicConverter.h>
 

+#include <folly/portability/GTest.h>
+

 #include <algorithm>
 #include <algorithm>

-#include <gtest/gtest.h>

 #include <map>
 #include <vector>
 
 #include <map>
 #include <vector>
 

diff --git a/folly/test/DynamicOtherTest.cpp b/folly/test/DynamicOtherTest.cpp
index bf3b462f32ce516ce3ef68d3b973f3f862520519..df755294c912e8f8c54582513d53b2219b5c2317 100644 (file)
--- a/folly/test/DynamicOtherTest.cpp
+++ b/folly/test/DynamicOtherTest.cpp
@@ -19,8 +19,7 @@
 #include <folly/gen/Base.h>
 #include <folly/json.h>
 #include <folly/portability/GFlags.h>
 #include <folly/gen/Base.h>
 #include <folly/json.h>
 #include <folly/portability/GFlags.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 #include <iostream>
 
 
 #include <iostream>
 

diff --git a/folly/test/DynamicTest.cpp b/folly/test/DynamicTest.cpp
index 0fa5bdc2e16a07835907e8b7947a92b4941adf08..624118e44872b2681f8de4459981aed91493c011 100644 (file)
--- a/folly/test/DynamicTest.cpp
+++ b/folly/test/DynamicTest.cpp
@@ -16,8 +16,9 @@
 
 #include <folly/dynamic.h>
 
 
 #include <folly/dynamic.h>
 

+#include <folly/portability/GTest.h>
+

 #include <boost/next_prior.hpp>
 #include <boost/next_prior.hpp>

-#include <gtest/gtest.h>

 
 using folly::dynamic;
 
 
 using folly::dynamic;
 

diff --git a/folly/test/EndianTest.cpp b/folly/test/EndianTest.cpp
index f57bea9f47e9ebc558f0689c67b6c91b7916685c..93b0390e7db46298f5d5fa05215456f1eac157b3 100644 (file)
--- a/folly/test/EndianTest.cpp
+++ b/folly/test/EndianTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Bits.h>
 
 
 #include <folly/Bits.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/EnumerateTest.cpp b/folly/test/EnumerateTest.cpp
index 47ae5cd94df8d36077701029cbffc2bb227857ae..b3ed18d7a5b17b23ef5ad227282c22f4d05ff640 100644 (file)
--- a/folly/test/EnumerateTest.cpp
+++ b/folly/test/EnumerateTest.cpp
@@ -20,7 +20,7 @@
 
 #include <folly/Enumerate.h>
 #include <folly/Range.h>
 
 #include <folly/Enumerate.h>
 #include <folly/Range.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 TEST(Enumerate, Basic) {
   std::vector<std::string> v = {"abc", "a", "ab"};
 
 TEST(Enumerate, Basic) {
   std::vector<std::string> v = {"abc", "a", "ab"};

diff --git a/folly/test/EvictingCacheMapTest.cpp b/folly/test/EvictingCacheMapTest.cpp
index 7991a4c39bdde5c8b25e32f61147f83e39c4336d..0c3059076886b8bf8d040138e741337a879d60fd 100644 (file)
--- a/folly/test/EvictingCacheMapTest.cpp
+++ b/folly/test/EvictingCacheMapTest.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <set>
 
 #include <folly/EvictingCacheMap.h>
 #include <set>
 
 #include <folly/EvictingCacheMap.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ExceptionTest.cpp b/folly/test/ExceptionTest.cpp
index a77725d9729095ec87470d763066cba918a56888..cc0378c9199d164ff1f6beb49bff1e33799daf17 100644 (file)
--- a/folly/test/ExceptionTest.cpp
+++ b/folly/test/ExceptionTest.cpp
@@ -17,12 +17,12 @@
 #include <folly/Exception.h>
 
 #include <folly/experimental/TestUtil.h>
 #include <folly/Exception.h>
 
 #include <folly/experimental/TestUtil.h>

+#include <folly/portability/GTest.h>

 
 #include <cstdio>
 #include <memory>
 
 #include <glog/logging.h>
 
 #include <cstdio>
 #include <memory>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp
index a3b17e04bb1aa2c1cbb6a523db9d626ddf96d079..dc3a0ac69eabe9d5397a0e1efa450bcdb2783b12 100644 (file)
--- a/folly/test/ExceptionWrapperTest.cpp
+++ b/folly/test/ExceptionWrapperTest.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>

 #include <stdexcept>
 #include <stdexcept>

+

 #include <folly/ExceptionWrapper.h>
 #include <folly/Conv.h>
 #include <folly/Portability.h>
 #include <folly/ExceptionWrapper.h>
 #include <folly/Conv.h>
 #include <folly/Portability.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ExpectedTest.cpp b/folly/test/ExpectedTest.cpp
index 52c090394773a6aed891f84d59120ee8783ef02e..a10c9e865ff12545ba4c79fcea9c6ab2fbf787c5 100644 (file)
--- a/folly/test/ExpectedTest.cpp
+++ b/folly/test/ExpectedTest.cpp
@@ -16,6 +16,7 @@
 
 #include <folly/Expected.h>
 #include <folly/Portability.h>
 
 #include <folly/Expected.h>
 #include <folly/Portability.h>

+#include <folly/portability/GTest.h>

 
 #include <algorithm>
 #include <iomanip>
 
 #include <algorithm>
 #include <iomanip>


@@ -25,7 +26,6 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 using std::unique_ptr;
 using std::shared_ptr;
 
 using std::unique_ptr;
 using std::shared_ptr;

diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index c6945a1f2ee0656636bca1e10c9b96584b17df10..a31038f7c5d3710735d584ca788a3cba70568b46 100644 (file)
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -27,12 +27,12 @@
 #include <sstream>
 #include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>
 #include <sstream>
 #include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>

-#include <gtest/gtest.h>

 
 #include <folly/Foreach.h>
 #include <folly/Portability.h>
 #include <folly/Random.h>
 #include <folly/Conv.h>
 
 #include <folly/Foreach.h>
 #include <folly/Portability.h>
 #include <folly/Random.h>
 #include <folly/Conv.h>

+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index 0b676912be3b4304d33bac6e4610bf273fdcd541..cd95037067c2b273624237fc96683701a7030d72 100644 (file)
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -24,8 +24,8 @@
 #include <folly/Random.h>
 #include <folly/Traits.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Random.h>
 #include <folly/Traits.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <list>
 #include <memory>
 #include <boost/random.hpp>
 #include <list>
 #include <memory>
 #include <boost/random.hpp>

diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index 33a164a004efe0379dd05ef1c78f570c7556c8c4..54f64efedeeed9996d39fdb3245d1b0734a8167a 100644 (file)
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -22,8 +22,8 @@
 #include <folly/Random.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
 #include <folly/Random.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <list>
 #include <map>
 #include <memory>
 #include <list>
 #include <map>
 #include <memory>

diff --git a/folly/test/FileLockTest.cpp b/folly/test/FileLockTest.cpp
index eaf302eadfd313cb4418b7e0ad504b52ea45d530..eb25bfb040ef3eb0bf1d947d43b43cca3ecd1604 100644 (file)
--- a/folly/test/FileLockTest.cpp
+++ b/folly/test/FileLockTest.cpp
@@ -19,7 +19,6 @@
 #include <mutex>
 
 #include <glog/logging.h>
 #include <mutex>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 #include <boost/thread/locks.hpp>
 
 #include <folly/String.h>
 #include <boost/thread/locks.hpp>
 
 #include <folly/String.h>


@@ -27,6 +26,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GFlags.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::test;
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/test/FileTest.cpp b/folly/test/FileTest.cpp
index 290c53da55e62ad0ff3c7b21926dd42db62ae09f..4651f7b0d437d23f47a96cfe71ab119de392134b 100644 (file)
--- a/folly/test/FileTest.cpp
+++ b/folly/test/FileTest.cpp
@@ -18,8 +18,7 @@
 
 #include <folly/String.h>
 #include <folly/portability/Fcntl.h>
 
 #include <folly/String.h>
 #include <folly/portability/Fcntl.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/FileUtilTest.cpp b/folly/test/FileUtilTest.cpp
index 6526efa2facb5e81b3a6540e8b037f3e6ba3d9a4..26cfde95b2495049608a6852809ad8cb343cfc20 100644 (file)
--- a/folly/test/FileUtilTest.cpp
+++ b/folly/test/FileUtilTest.cpp
@@ -21,11 +21,11 @@
 #include <deque>
 
 #include <glog/logging.h>
 #include <deque>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/File.h>
 #include <folly/Range.h>
 #include <folly/String.h>
 
 #include <folly/File.h>
 #include <folly/Range.h>
 #include <folly/String.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/test/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp
index 94a574075251650f701e7873e78bc5f037686ef7..62de0481c45ea05d2fc1a3c84c8f9ed4dfb2312c 100644 (file)
--- a/folly/test/FingerprintTest.cpp
+++ b/folly/test/FingerprintTest.cpp
@@ -17,10 +17,10 @@
 #include <folly/Fingerprint.h>
 
 #include <glog/logging.h>
 #include <folly/Fingerprint.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/detail/SlowFingerprint.h>
 #include <folly/Benchmark.h>
 
 #include <folly/detail/SlowFingerprint.h>
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::detail;
 
 using namespace folly;
 using namespace folly::detail;

diff --git a/folly/test/ForeachBenchmark.cpp b/folly/test/ForeachBenchmark.cpp
index dfb24445b630a7209058b1ab2ec3d19d7cc9377c..e3a96f0792c20b906ee2a0be078bb1c94e466f63 100644 (file)
--- a/folly/test/ForeachBenchmark.cpp
+++ b/folly/test/ForeachBenchmark.cpp
@@ -17,8 +17,8 @@
 #include <folly/Foreach.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Foreach.h>
 
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 

-#include <gtest/gtest.h>

 #include <map>
 
 using namespace folly;
 #include <map>
 
 using namespace folly;

diff --git a/folly/test/ForeachTest.cpp b/folly/test/ForeachTest.cpp
index bba0413d977ea6b45cfded82d94e976f78e2196b..9904084d631ce816280e265559c0903a85179789 100644 (file)
--- a/folly/test/ForeachTest.cpp
+++ b/folly/test/ForeachTest.cpp
@@ -16,7 +16,8 @@
 
 #include <folly/Foreach.h>
 
 
 #include <folly/Foreach.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+

 #include <map>
 #include <string>
 #include <vector>
 #include <map>
 #include <string>
 #include <vector>

diff --git a/folly/test/FormatOtherTest.cpp b/folly/test/FormatOtherTest.cpp
index 951321665dd2f213695f341d16bbc249d7cce022..466d3c6594b0175f69e08d40c9c468d5b547853e 100644 (file)
--- a/folly/test/FormatOtherTest.cpp
+++ b/folly/test/FormatOtherTest.cpp
@@ -17,13 +17,13 @@
 #include <folly/Format.h>
 
 #include <glog/logging.h>
 #include <folly/Format.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/FBVector.h>
 #include <folly/FileUtil.h>
 #include <folly/dynamic.h>
 #include <folly/json.h>
 #include <folly/small_vector.h>
 
 #include <folly/FBVector.h>
 #include <folly/FileUtil.h>
 #include <folly/dynamic.h>
 #include <folly/json.h>
 #include <folly/small_vector.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/FormatTest.cpp b/folly/test/FormatTest.cpp
index d1d8c96aea34877ae54ee3518eb25b600c907414..f8e27e317ed8ae6a6a772414417a2c601e1626bb 100644 (file)
--- a/folly/test/FormatTest.cpp
+++ b/folly/test/FormatTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Format.h>
 
 
 #include <folly/Format.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 #include <string>
 
 
 #include <string>
 

diff --git a/folly/test/FunctionSchedulerTest.cpp b/folly/test/FunctionSchedulerTest.cpp
index 4fed1e9004d27cd409aae463c87546bc6fd4e438..bfe2afb1a8ac2e39c843f15770208548e08fb4b3 100644 (file)
--- a/folly/test/FunctionSchedulerTest.cpp
+++ b/folly/test/FunctionSchedulerTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 #include <atomic>
  * limitations under the License.
  */
 #include <atomic>

-#include <gtest/gtest.h>

 
 #include <folly/experimental/FunctionScheduler.h>
 
 #include <folly/experimental/FunctionScheduler.h>

+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/test/FunctionTest.cpp b/folly/test/FunctionTest.cpp
index 1c18e481d6a9c3e0f9ba11544e0fb663ad04ab6b..b23eb3e941e47084070aadaf4c3c72fa82aec6f0 100644 (file)
--- a/folly/test/FunctionTest.cpp
+++ b/folly/test/FunctionTest.cpp
@@ -20,7 +20,7 @@
 #include <folly/Function.h>
 
 #include <folly/Memory.h>
 #include <folly/Function.h>
 
 #include <folly/Memory.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::Function;
 
 
 using folly::Function;
 

diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp
index 36d11f8e28fe9841320ea01a3325f412b1d9d1c5..da7dca3c64615a8640342d0058c2a2c46a76804b 100644 (file)
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -23,9 +23,9 @@
 #include <thread>
 
 #include <glog/logging.h>
 #include <thread>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/portability/Time.h>
 
 #include <folly/portability/Time.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly::detail;
 using namespace folly::test;
 
 using namespace folly::detail;
 using namespace folly::test;

diff --git a/folly/test/GroupVarintTest.cpp b/folly/test/GroupVarintTest.cpp
index 8b05713ce2655ee9ca315d06aa2c54b0f27282d7..2f2dcf82574c0bcb560ae57fe3ef5a539d618f45 100644 (file)
--- a/folly/test/GroupVarintTest.cpp
+++ b/folly/test/GroupVarintTest.cpp
@@ -21,7 +21,7 @@
 // On platforms where it's not supported, GroupVarint will be compiled out.
 #if HAVE_GROUP_VARINT
 
 // On platforms where it's not supported, GroupVarint will be compiled out.
 #if HAVE_GROUP_VARINT
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/HasMemberFnTraitsTest.cpp b/folly/test/HasMemberFnTraitsTest.cpp
index dc8c0f98cbf3750e6db2350d73b0c3f18a34007b..2414eeefa3b991e46540da8df5cd63e2702e8b0c 100644 (file)
--- a/folly/test/HasMemberFnTraitsTest.cpp
+++ b/folly/test/HasMemberFnTraitsTest.cpp
@@ -20,7 +20,8 @@
 
 #include <folly/Traits.h>
 
 
 #include <folly/Traits.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+

 #include <glog/logging.h>
 
 #include <string>
 #include <glog/logging.h>
 
 #include <string>

diff --git a/folly/test/HashTest.cpp b/folly/test/HashTest.cpp
index 62618d3172a4093696e1e177ce1a4c9b69de9195..e2c8e38adfc86fe0cdb5768e41627bdc1735c836 100644 (file)
--- a/folly/test/HashTest.cpp
+++ b/folly/test/HashTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Hash.h>
 #include <folly/MapUtil.h>
 
 #include <folly/Hash.h>
 #include <folly/MapUtil.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 #include <stdint.h>
 #include <unordered_map>
 #include <utility>
 #include <stdint.h>
 #include <unordered_map>
 #include <utility>

diff --git a/folly/test/HistogramTest.cpp b/folly/test/HistogramTest.cpp
index 680d8c0cb4e537b05b6707ab2c0cda4104a1d34f..c7b233c691fae8065abcd85b6a6b3cc50ed87fad 100644 (file)
--- a/folly/test/HistogramTest.cpp
+++ b/folly/test/HistogramTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
 
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::Histogram;
 
 
 using folly::Histogram;
 

diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp
index 5097eafa646e04bfa7754ccc6eb92c90cda0561c..9fc746d7aedffe63f90b3dba9b1d7627935c45a5 100644 (file)
--- a/folly/test/IPAddressTest.cpp
+++ b/folly/test/IPAddressTest.cpp
@@ -16,13 +16,12 @@
 
 #include <folly/test/IPAddressTest.h>
 
 
 #include <folly/test/IPAddressTest.h>
 

-#include <gtest/gtest.h>
-

 #include <folly/Bits.h>
 #include <folly/Format.h>
 #include <folly/MacAddress.h>
 #include <folly/String.h>
 #include <folly/detail/IPAddressSource.h>
 #include <folly/Bits.h>
 #include <folly/Format.h>
 #include <folly/MacAddress.h>
 #include <folly/String.h>
 #include <folly/detail/IPAddressSource.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace std;
 
 using namespace folly;
 using namespace std;

diff --git a/folly/test/IPAddressTest.h b/folly/test/IPAddressTest.h
index 01aa3c49021485caf61b464ba020e03b4c569367..20633b167954a1dd384a043bea823a832ab049f0 100644 (file)
--- a/folly/test/IPAddressTest.h
+++ b/folly/test/IPAddressTest.h
@@ -18,11 +18,10 @@
 
 #include <string>
 
 
 #include <string>
 

-#include <gtest/gtest.h>
-

 #include <sys/types.h>
 
 #include <folly/IPAddress.h>
 #include <sys/types.h>
 
 #include <folly/IPAddress.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 
 namespace folly {
 #include <folly/portability/Sockets.h>
 
 namespace folly {

diff --git a/folly/test/IndestructibleTest.cpp b/folly/test/IndestructibleTest.cpp
index 6ee8005d21033c10f3e1b1cf1ebda8bcdc6b6e31..4e144eec4b3160201a95a8bc37b79bcf2604dce1 100644 (file)
--- a/folly/test/IndestructibleTest.cpp
+++ b/folly/test/IndestructibleTest.cpp
@@ -20,8 +20,9 @@
 #include <map>
 #include <memory>
 #include <string>
 #include <map>
 #include <memory>
 #include <string>

-#include <gtest/gtest.h>
+

 #include <folly/Memory.h>
 #include <folly/Memory.h>

+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/IndexedMemPoolTest.cpp b/folly/test/IndexedMemPoolTest.cpp
index 03e24ee2aac5576c752acea07255f13300340a93..1cfa69071b71b6d0aaac6f0b7276e28715494ed1 100644 (file)
--- a/folly/test/IndexedMemPoolTest.cpp
+++ b/folly/test/IndexedMemPoolTest.cpp
@@ -16,11 +16,12 @@
 
 #include <folly/IndexedMemPool.h>
 #include <folly/test/DeterministicSchedule.h>
 
 #include <folly/IndexedMemPool.h>
 #include <folly/test/DeterministicSchedule.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 #include <folly/portability/Unistd.h>

+

 #include <string>
 #include <thread>
 #include <semaphore.h>
 #include <string>
 #include <thread>
 #include <semaphore.h>

-#include <gtest/gtest.h>

 
 using namespace folly;
 using namespace folly::test;
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/test/JsonOtherTest.cpp b/folly/test/JsonOtherTest.cpp
index 01fd4cff1aae5bb028c2a8ed1b4b3b5043a0d9db..dd1a5b83de109a37ff410ebdf848cb277bb5444d 100644 (file)
--- a/folly/test/JsonOtherTest.cpp
+++ b/folly/test/JsonOtherTest.cpp
@@ -19,8 +19,7 @@
 #include <folly/Benchmark.h>
 #include <folly/FileUtil.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Benchmark.h>
 #include <folly/FileUtil.h>
 #include <folly/portability/GFlags.h>

-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::dynamic;
 using folly::parseJson;
 
 using folly::dynamic;
 using folly::parseJson;

diff --git a/folly/test/JsonTest.cpp b/folly/test/JsonTest.cpp
index a57b493c127775b49d1722f98538aae2b6d61923..805cb3004ffa56a4855f20a38fb181658ffbe4bd 100644 (file)
--- a/folly/test/JsonTest.cpp
+++ b/folly/test/JsonTest.cpp
@@ -16,8 +16,9 @@
 #include <limits>
 
 #include <boost/next_prior.hpp>
 #include <limits>
 
 #include <boost/next_prior.hpp>

+

 #include <folly/json.h>
 #include <folly/json.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using folly::dynamic;
 using folly::parseJson;
 
 using folly::dynamic;
 using folly::parseJson;

diff --git a/folly/test/LazyTest.cpp b/folly/test/LazyTest.cpp
index 373d2245646aa491f7652295cdfe23ae45c87d49..5a11ff9815cfe5347ea9ab8c34c8a6187c9ff1c0 100644 (file)
--- a/folly/test/LazyTest.cpp
+++ b/folly/test/LazyTest.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <iostream>
 
 #include <functional>
 #include <iostream>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index 09234c9eaeeb2fb5cf7570ddf59252fe507c4980..c16fe4a0feb28c5cb804a7546aeb45e961885906 100644 (file)
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -19,12 +19,11 @@
 #include <semaphore.h>
 #include <thread>
 
 #include <semaphore.h>
 #include <thread>
 

-#include <gtest/gtest.h>
-

 #include <folly/Benchmark.h>
 #include <folly/Random.h>
 #include <folly/portability/Asm.h>
 #include <folly/portability/GFlags.h>
 #include <folly/Benchmark.h>
 #include <folly/Random.h>
 #include <folly/portability/Asm.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;

diff --git a/folly/test/LockTraitsTest.cpp b/folly/test/LockTraitsTest.cpp
index d77d8206d39504ed9efe87c3530164b8617a3eb8..677a6516a9b8c880f0d0d41950be7d8bc4161960 100644 (file)
--- a/folly/test/LockTraitsTest.cpp
+++ b/folly/test/LockTraitsTest.cpp
@@ -16,12 +16,12 @@
 #include <folly/LockTraits.h>
 #include <folly/LockTraitsBoost.h>
 
 #include <folly/LockTraits.h>
 #include <folly/LockTraitsBoost.h>
 

-#include <gtest/gtest.h>

 #include <mutex>
 
 #include <folly/RWSpinLock.h>
 #include <folly/SharedMutex.h>
 #include <folly/SpinLock.h>
 #include <mutex>
 
 #include <folly/RWSpinLock.h>
 #include <folly/SharedMutex.h>
 #include <folly/SpinLock.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/LoggingTest.cpp b/folly/test/LoggingTest.cpp
index 734640decfb5e94e5451b0683e0b2f2309678018..9b752c5439ba86ee38678c3ef8c648cb00e53416 100644 (file)
--- a/folly/test/LoggingTest.cpp
+++ b/folly/test/LoggingTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Logging.h>
 
 
 #include <folly/Logging.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 #include <vector>
 
 
 #include <vector>
 

diff --git a/folly/test/MPMCPipelineTest.cpp b/folly/test/MPMCPipelineTest.cpp
index 1914b6737558b2dff9fd99e8279775399518af40..aed9f96920880987822abaf97b3b9ed9afafb0e3 100644 (file)
--- a/folly/test/MPMCPipelineTest.cpp
+++ b/folly/test/MPMCPipelineTest.cpp
@@ -20,9 +20,9 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Conv.h>
 
 #include <folly/Conv.h>

+#include <folly/portability/GTest.h>

 
 namespace folly { namespace test {
 
 
 namespace folly { namespace test {
 

diff --git a/folly/test/MPMCQueueTest.cpp b/folly/test/MPMCQueueTest.cpp
index f4a195a492b998ce9d88f854e5d5a62bf50a191d..cc9e8c123460ddc09109f0d2c2cd579eb2edfa39 100644 (file)
--- a/folly/test/MPMCQueueTest.cpp
+++ b/folly/test/MPMCQueueTest.cpp
@@ -17,6 +17,7 @@
 #include <folly/MPMCQueue.h>
 #include <folly/Format.h>
 #include <folly/Memory.h>
 #include <folly/MPMCQueue.h>
 #include <folly/Format.h>
 #include <folly/Memory.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/SysResource.h>
 #include <folly/portability/SysTime.h>
 #include <folly/portability/Unistd.h>
 #include <folly/portability/SysResource.h>
 #include <folly/portability/SysTime.h>
 #include <folly/portability/Unistd.h>


@@ -28,8 +29,6 @@
 #include <thread>
 #include <utility>
 
 #include <thread>
 #include <utility>
 

-#include <gtest/gtest.h>
-

 FOLLY_ASSUME_FBVECTOR_COMPATIBLE_1(boost::intrusive_ptr);
 
 using namespace folly;
 FOLLY_ASSUME_FBVECTOR_COMPATIBLE_1(boost::intrusive_ptr);
 
 using namespace folly;

diff --git a/folly/test/MacAddressTest.cpp b/folly/test/MacAddressTest.cpp
index b97ea211484987f5c00d70dbf07db73d9e6c26b4..ae70a9c0994c736c63b6aa15321ca365950be42a 100644 (file)
--- a/folly/test/MacAddressTest.cpp
+++ b/folly/test/MacAddressTest.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/Conv.h>
 #include <folly/IPAddressV6.h>
 #include <folly/MacAddress.h>
 #include <folly/Conv.h>
 #include <folly/IPAddressV6.h>
 #include <folly/MacAddress.h>

+#include <folly/portability/GTest.h>

 
 using folly::MacAddress;
 using folly::IPAddressV6;
 
 using folly::MacAddress;
 using folly::IPAddressV6;

diff --git a/folly/test/MallctlHelperTest.cpp b/folly/test/MallctlHelperTest.cpp
index ad6659986f19ec13f478095d46ef47ffc2fcec9a..04236c8e59a974033231d51759d83d979f5e40e5 100644 (file)
--- a/folly/test/MallctlHelperTest.cpp
+++ b/folly/test/MallctlHelperTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/MallctlHelper.h>
 #include <folly/Malloc.h>
 #include <folly/init/Init.h>
 #include <folly/MallctlHelper.h>
 #include <folly/Malloc.h>
 #include <folly/init/Init.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/MapUtilTest.cpp b/folly/test/MapUtilTest.cpp
index 7ba12a984d02be21f4dfd7fc2592bac5a1c58f3b..4584faf12c8f4cc8f05214d29ffa03fd638c5e22 100644 (file)
--- a/folly/test/MapUtilTest.cpp
+++ b/folly/test/MapUtilTest.cpp
@@ -17,7 +17,8 @@
 #include <folly/MapUtil.h>
 
 #include <map>
 #include <folly/MapUtil.h>
 
 #include <map>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/MathTest.cpp b/folly/test/MathTest.cpp
index 166d2a748e3b785b796383614d4fec9c4b5f7239..60c6b2bf6be7747e25bc4e7ea16406133b5e260b 100644 (file)
--- a/folly/test/MathTest.cpp
+++ b/folly/test/MathTest.cpp
@@ -22,9 +22,9 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Portability.h>
 
 #include <folly/Portability.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace folly::detail;
 
 using namespace folly;
 using namespace folly::detail;

diff --git a/folly/test/MemcpyTest.cpp b/folly/test/MemcpyTest.cpp
index f6635f4eacffc353f82acd3b6dfca6a505eaffcf..9c4a141f568db096405e0342dc188b333090bd0b 100644 (file)
--- a/folly/test/MemcpyTest.cpp
+++ b/folly/test/MemcpyTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Portability.h>
 
 
 #include <folly/Portability.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 namespace {
 
 
 namespace {
 

diff --git a/folly/test/MemoryIdlerTest.cpp b/folly/test/MemoryIdlerTest.cpp
index d1536d0bebd69151c4359fff9155d8f096ae4864..74e377a8578b0ee81186a1c9276c03ce2aae1b9f 100644 (file)
--- a/folly/test/MemoryIdlerTest.cpp
+++ b/folly/test/MemoryIdlerTest.cpp
@@ -18,6 +18,7 @@
 
 #include <folly/Baton.h>
 #include <folly/portability/GMock.h>
 
 #include <folly/Baton.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Windows.h>
 
 #include <memory>
 #include <folly/portability/Windows.h>
 
 #include <memory>


@@ -25,8 +26,6 @@
 #include <assert.h>
 #include <semaphore.h>
 
 #include <assert.h>
 #include <semaphore.h>
 

-#include <gtest/gtest.h>
-

 using namespace folly;
 using namespace folly::detail;
 using namespace testing;
 using namespace folly;
 using namespace folly::detail;
 using namespace testing;

diff --git a/folly/test/MemoryMappingTest.cpp b/folly/test/MemoryMappingTest.cpp
index 1d80cd2e7d90f558c6c31886b5c55f711379acd1..f438c66c639093679c03c384ff49d9b9ef7834c7 100644 (file)
--- a/folly/test/MemoryMappingTest.cpp
+++ b/folly/test/MemoryMappingTest.cpp
@@ -19,10 +19,9 @@
 #include <folly/FileUtil.h>
 #include <folly/MemoryMapping.h>
 #include <folly/Random.h>
 #include <folly/FileUtil.h>
 #include <folly/MemoryMapping.h>
 #include <folly/Random.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/SysMman.h>
 
 #include <folly/portability/SysMman.h>
 

-#include <gtest/gtest.h>
-

 static constexpr double kSomeDouble = 3.14;
 
 namespace folly {
 static constexpr double kSomeDouble = 3.14;
 
 namespace folly {

diff --git a/folly/test/MemoryTest.cpp b/folly/test/MemoryTest.cpp
index c35e40b9d95bbd4b7f4f5991340a82cdf773ebfa..d7660476a085f2be7dbb0525c533b92c21bc6806 100644 (file)
--- a/folly/test/MemoryTest.cpp
+++ b/folly/test/MemoryTest.cpp
@@ -17,9 +17,9 @@
 #include <folly/Memory.h>
 #include <folly/Arena.h>
 #include <folly/String.h>
 #include <folly/Memory.h>
 #include <folly/Arena.h>
 #include <folly/String.h>

+#include <folly/portability/GTest.h>

 
 #include <glog/logging.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <type_traits>
 
 
 #include <type_traits>
 

diff --git a/folly/test/MergeTest.cpp b/folly/test/MergeTest.cpp
index 880c5e981ea61c7b0e60de44dcdf37ff0faacf0b..ae0693b1532ea5b752d0587a948f36ce054386ce 100644 (file)
--- a/folly/test/MergeTest.cpp
+++ b/folly/test/MergeTest.cpp
@@ -15,10 +15,12 @@
  */
 
 #include <folly/Merge.h>
  */
 
 #include <folly/Merge.h>

-#include <gtest/gtest.h>
+

 #include <map>
 #include <vector>
 
 #include <map>
 #include <vector>
 

+#include <folly/portability/GTest.h>
+

 TEST(MergeTest, NonOverlapping) {
   std::vector<int> a = {0, 2, 4, 6};
   std::vector<int> b = {1, 3, 5, 7};
 TEST(MergeTest, NonOverlapping) {
   std::vector<int> a = {0, 2, 4, 6};
   std::vector<int> b = {1, 3, 5, 7};

diff --git a/folly/test/MoveWrapperTest.cpp b/folly/test/MoveWrapperTest.cpp
index 74b283e380f5cb93a02f7bd22df4e325c344a951..168af64fbb352e37ecf0d14875ee41ee3759944b 100644 (file)
--- a/folly/test/MoveWrapperTest.cpp
+++ b/folly/test/MoveWrapperTest.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/MoveWrapper.h>
 #include <folly/MoveWrapper.h>

+

 #include <memory>
 
 #include <memory>
 

+#include <folly/portability/GTest.h>
+

 namespace folly {
 
 TEST(makeMoveWrapper, Empty) {
 namespace folly {
 
 TEST(makeMoveWrapper, Empty) {

diff --git a/folly/test/OptionalTest.cpp b/folly/test/OptionalTest.cpp
index 0fc31e0b95a5d7232b54cdecf119d22392018954..96f6e5caa2d557c927dcee9e962a4e30f74635c6 100644 (file)
--- a/folly/test/OptionalTest.cpp
+++ b/folly/test/OptionalTest.cpp
@@ -16,6 +16,7 @@
 
 #include <folly/Optional.h>
 #include <folly/Portability.h>
 
 #include <folly/Optional.h>
 #include <folly/Portability.h>

+#include <folly/portability/GTest.h>

 
 #include <memory>
 #include <vector>
 
 #include <memory>
 #include <vector>


@@ -25,7 +26,6 @@
 #include <type_traits>
 
 #include <glog/logging.h>
 #include <type_traits>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 #include <boost/optional.hpp>
 
 using std::unique_ptr;
 #include <boost/optional.hpp>
 
 using std::unique_ptr;

diff --git a/folly/test/PackedSyncPtrTest.cpp b/folly/test/PackedSyncPtrTest.cpp
index c5b28b26b15531f739a5ec9670f6b16be56382c7..b83dd679f4b69f2f6d1492b82b827aefff8bd6c8 100644 (file)
--- a/folly/test/PackedSyncPtrTest.cpp
+++ b/folly/test/PackedSyncPtrTest.cpp
@@ -17,11 +17,12 @@
 #include <folly/PackedSyncPtr.h>
 
 #include <cinttypes>
 #include <folly/PackedSyncPtr.h>
 
 #include <cinttypes>

-#include <gtest/gtest.h>

 #include <thread>
 #include <unordered_map>
 #include <utility>
 
 #include <thread>
 #include <unordered_map>
 #include <utility>
 

+#include <folly/portability/GTest.h>
+

 using folly::PackedSyncPtr;
 
 namespace {
 using folly::PackedSyncPtr;
 
 namespace {

diff --git a/folly/test/PaddedTest.cpp b/folly/test/PaddedTest.cpp
index b86e2090dc58de68c7de50e255fb3fcdecb6bf2e..017a02d103ad9e3c1e0439c8c2b13b6ee4efb7ad 100644 (file)
--- a/folly/test/PaddedTest.cpp
+++ b/folly/test/PaddedTest.cpp
@@ -17,7 +17,8 @@
 #include <folly/Padded.h>
 
 #include <glog/logging.h>
 #include <folly/Padded.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/PartialTest.cpp b/folly/test/PartialTest.cpp
index 025cd25f51cfd54d9db97ec59d22069a894d51a1..1d19e020d3734b67bd9899d10c2f4419d5089f17 100644 (file)
--- a/folly/test/PartialTest.cpp
+++ b/folly/test/PartialTest.cpp
@@ -17,7 +17,8 @@
 #include <memory>
 
 #include <folly/Partial.h>
 #include <memory>
 
 #include <folly/Partial.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 using folly::partial;
 
 
 using folly::partial;
 

diff --git a/folly/test/PortabilityTest.cpp b/folly/test/PortabilityTest.cpp
index 8ff47aa096fb4ca3f605c6b8cf8cadbf7f324475..58d104d940c7eeeb150cf2e9c66831fad79e9d61 100644 (file)
--- a/folly/test/PortabilityTest.cpp
+++ b/folly/test/PortabilityTest.cpp
@@ -18,7 +18,7 @@
 
 #include <memory>
 
 
 #include <memory>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 class Base {
  public:
 
 class Base {
  public:

diff --git a/folly/test/ProducerConsumerQueueTest.cpp b/folly/test/ProducerConsumerQueueTest.cpp
index bd1fa0c377d9ad0d2ce161da50217ef4de120700..4fe0a6653bf5fc4dee61713f7093748ca5951393 100644 (file)
--- a/folly/test/ProducerConsumerQueueTest.cpp
+++ b/folly/test/ProducerConsumerQueueTest.cpp
@@ -23,7 +23,8 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 

diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index a6a40415b4c00a3e5fdc777980a7068ef7a1a88d..edf037ba9b4aaaf534998a407516b8c091e502c2 100644 (file)
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -25,9 +25,9 @@
 #include <thread>
 
 #include <glog/logging.h>
 #include <thread>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/portability/GFlags.h>
 
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(num_threads, 8, "num threads");
 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(num_threads, 8, "num threads");

diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp
index d7c4f4a58ab988ac4a64b00bbbad1b069e0a3e17..7d175b6e3bb2fe79ab7deed7ef1438e767009130 100644 (file)
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -17,13 +17,14 @@
 #include <folly/Random.h>
 
 #include <glog/logging.h>
 #include <folly/Random.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <algorithm>
 #include <thread>
 #include <vector>
 #include <random>
 
 
 #include <algorithm>
 #include <thread>
 #include <vector>
 #include <random>
 

+#include <folly/portability/GTest.h>
+

 using namespace folly;
 
 TEST(Random, StateSize) {
 using namespace folly;
 
 TEST(Random, StateSize) {

diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp
index 0a1d03ace08a1b1b8b3270c1f59115c1fdd1b7e3..ef4c1e1e341d0ea07145b4760b3999eec7f02e98 100644 (file)
--- a/folly/test/RangeTest.cpp
+++ b/folly/test/RangeTest.cpp
@@ -19,6 +19,7 @@
 
 #include <folly/Range.h>
 
 
 #include <folly/Range.h>
 

+#include <folly/portability/GTest.h>

 #include <folly/portability/Memory.h>
 #include <folly/portability/SysMman.h>
 
 #include <folly/portability/Memory.h>
 #include <folly/portability/SysMman.h>
 


@@ -31,7 +32,6 @@
 #include <vector>
 #include <boost/range/concepts.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <vector>
 #include <boost/range/concepts.hpp>
 #include <boost/algorithm/string/trim.hpp>

-#include <gtest/gtest.h>

 
 using namespace folly;
 using namespace folly::detail;
 
 using namespace folly;
 using namespace folly::detail;

diff --git a/folly/test/SafeAssertTest.cpp b/folly/test/SafeAssertTest.cpp
index bfaa3dd6a0da1ee93f421db345a6234acc2158f7..0cb59b96c5ac906f5e64fcbd4ce73201ad1921e4 100644 (file)
--- a/folly/test/SafeAssertTest.cpp
+++ b/folly/test/SafeAssertTest.cpp
@@ -17,9 +17,9 @@
 #include <folly/SafeAssert.h>
 
 #include <glog/logging.h>
 #include <folly/SafeAssert.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Benchmark.h>
 
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ScopeGuardTest.cpp b/folly/test/ScopeGuardTest.cpp
index 93507da2d55aa5fb9873bbe3853eeacf0699e153..892a4352a20b9b3c0ceec7523fae39dade24f979 100644 (file)
--- a/folly/test/ScopeGuardTest.cpp
+++ b/folly/test/ScopeGuardTest.cpp
@@ -17,12 +17,13 @@
 #include <folly/ScopeGuard.h>
 #include <folly/Portability.h>
 
 #include <folly/ScopeGuard.h>
 #include <folly/Portability.h>
 

-#include <gtest/gtest.h>

 #include <glog/logging.h>
 
 #include <functional>
 #include <stdexcept>
 
 #include <glog/logging.h>
 
 #include <functional>
 #include <stdexcept>
 

+#include <folly/portability/GTest.h>
+

 using folly::ScopeGuard;
 using folly::makeGuard;
 using std::vector;
 using folly::ScopeGuard;
 using folly::makeGuard;
 using std::vector;

diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp
index 7ca552395be3cfa083cfad5880ae03aeff3f4581..dc0274c860e5e576f8543bdee9898323396a2ea3 100644 (file)
--- a/folly/test/SharedMutexTest.cpp
+++ b/folly/test/SharedMutexTest.cpp
@@ -20,7 +20,6 @@
 #include <thread>
 #include <vector>
 
 #include <thread>
 #include <vector>
 

-#include <gtest/gtest.h>

 #include <boost/optional.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
 #include <boost/optional.hpp>
 #include <boost/thread/shared_mutex.hpp>
 


@@ -29,6 +28,7 @@
 #include <folly/RWSpinLock.h>
 #include <folly/Random.h>
 #include <folly/portability/GFlags.h>
 #include <folly/RWSpinLock.h>
 #include <folly/Random.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;

diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index 627c954741c92b4ae53984c97cb19c8dd8e8a472..6e8b2323d332b7290f7a104bd0fd6d71f86894df 100644 (file)
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -21,10 +21,10 @@
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>

+#include <folly/portability/GTest.h>

 #include <folly/test/SingletonTestStructs.h>
 
 #include <glog/logging.h>
 #include <folly/test/SingletonTestStructs.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 #include <boost/thread/barrier.hpp>
 
 using namespace folly;
 #include <boost/thread/barrier.hpp>
 
 using namespace folly;

diff --git a/folly/test/SingletonTestGlobal.cpp b/folly/test/SingletonTestGlobal.cpp
index 7410d5f134e198202c23906045a5d8309fc95163..d62f41d1bea483f1158c82e443242e7c43746edc 100644 (file)
--- a/folly/test/SingletonTestGlobal.cpp
+++ b/folly/test/SingletonTestGlobal.cpp
@@ -20,9 +20,9 @@
 #include <folly/Singleton.h>
 #include <folly/Benchmark.h>
 #include <folly/test/SingletonTestStructs.h>
 #include <folly/Singleton.h>
 #include <folly/Benchmark.h>
 #include <folly/test/SingletonTestStructs.h>

+#include <folly/portability/GTest.h>

 
 #include <glog/logging.h>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 /*
  * This test needs to be in its own file, as a standalone program.
 
 /*
  * This test needs to be in its own file, as a standalone program.

diff --git a/folly/test/SingletonTestStructs.h b/folly/test/SingletonTestStructs.h
index fecf5373cced1a9d0bfdaa4f01a7590ccb11cf50..d8a90c9c72c63ad1b2dd9f0b532420e2801d3a04 100644 (file)
--- a/folly/test/SingletonTestStructs.h
+++ b/folly/test/SingletonTestStructs.h
@@ -20,7 +20,8 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>

 
 // A simple class that tracks how often instances of the class and
 // subclasses are created, and the ordering.  Also tracks a global
 
 // A simple class that tracks how often instances of the class and
 // subclasses are created, and the ordering.  Also tracks a global

diff --git a/folly/test/SingletonVaultCTest.cpp b/folly/test/SingletonVaultCTest.cpp
index 00e9f5b9591afc8e0d428b973de891ff42382250..471cc3571d74de686eda0252cfee842ca4494879 100644 (file)
--- a/folly/test/SingletonVaultCTest.cpp
+++ b/folly/test/SingletonVaultCTest.cpp
@@ -17,10 +17,10 @@
 #include <folly/Singleton.h>
 #include <folly/SingletonVault_c.h>
 
 #include <folly/Singleton.h>
 #include <folly/SingletonVault_c.h>
 

-#include <gtest/gtest.h>
-

 #include <thread>
 
 #include <thread>
 

+#include <folly/portability/GTest.h>
+

 FOLLY_TLS long instance_counter_instances = 0;
 
 class InstanceCounter {
 FOLLY_TLS long instance_counter_instances = 0;
 
 class InstanceCounter {

diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp
index 41c2ce65505617e6aee06196229c125676031beb..020c713623b62b98d1ef7637a1d154305ec5d903 100644 (file)
--- a/folly/test/SmallLocksTest.cpp
+++ b/folly/test/SmallLocksTest.cpp
@@ -28,9 +28,8 @@
 
 #include <thread>
 
 
 #include <thread>
 

-#include <gtest/gtest.h>
-

 #include <folly/portability/Asm.h>
 #include <folly/portability/Asm.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 using folly::MSLGuard;
 #include <folly/portability/Unistd.h>
 
 using folly::MSLGuard;

diff --git a/folly/test/SocketAddressTest.cpp b/folly/test/SocketAddressTest.cpp
index 145aa863b2c365696b035e72d0c973848457f20d..200f7258fcb1f0d5fc8e23f77649e41419d36250 100644 (file)
--- a/folly/test/SocketAddressTest.cpp
+++ b/folly/test/SocketAddressTest.cpp
@@ -16,11 +16,11 @@
 
 #include <folly/SocketAddress.h>
 
 
 #include <folly/SocketAddress.h>
 

-#include <gtest/gtest.h>

 #include <iostream>
 #include <sstream>
 #include <system_error>
 
 #include <iostream>
 #include <sstream>
 #include <system_error>
 

+#include <folly/portability/GTest.h>

 #include <folly/portability/Sockets.h>
 #include <folly/portability/Stdlib.h>
 #include <folly/test/SocketAddressTestHelper.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Stdlib.h>
 #include <folly/test/SocketAddressTestHelper.h>

diff --git a/folly/test/SparseByteSetTest.cpp b/folly/test/SparseByteSetTest.cpp
index f5f6f1a1103730dff6f69eef41a0abc88290e4da..418d797da525285f36cf38e619c76bfa1d13658f 100644 (file)
--- a/folly/test/SparseByteSetTest.cpp
+++ b/folly/test/SparseByteSetTest.cpp
@@ -21,7 +21,7 @@
 #include <random>
 #include <set>
 
 #include <random>
 #include <set>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/SpinLockTest.cpp b/folly/test/SpinLockTest.cpp
index 6d028af1e0f923a8436f4f247c641f8afe0fad19..0312240202402885c9a8b2029f9f7ca304b9086c 100644 (file)
--- a/folly/test/SpinLockTest.cpp
+++ b/folly/test/SpinLockTest.cpp
@@ -17,10 +17,10 @@
 
 #include <folly/Random.h>
 
 
 #include <folly/Random.h>
 

-#include <gtest/gtest.h>

 #include <thread>
 
 #include <folly/portability/Asm.h>
 #include <thread>
 
 #include <folly/portability/Asm.h>

+#include <folly/portability/GTest.h>

 
 using folly::SpinLockGuardImpl;
 
 
 using folly::SpinLockGuardImpl;
 

diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp
index 9748a759c33ad99e6a05afd7c6f436dd848255de..4b81ce1997ab1bfe1230645cc17c2ae7153b1f03 100644 (file)
--- a/folly/test/SpookyHashV1Test.cpp
+++ b/folly/test/SpookyHashV1Test.cpp
@@ -22,6 +22,7 @@
 
 #include <folly/SpookyHashV1.h>
 #include <folly/Benchmark.h>
 
 #include <folly/SpookyHashV1.h>
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 #include <cinttypes>
 #include <cstdio>
 
 #include <cinttypes>
 #include <cstdio>


@@ -30,8 +31,6 @@
 #include <cstdlib>
 #include <ctime>
 
 #include <cstdlib>
 #include <ctime>
 

-#include <gtest/gtest.h>
-

 using namespace ::folly::hash;
 
 static bool failed = false;
 using namespace ::folly::hash;
 
 static bool failed = false;

diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp
index 65503baae5cf14aa445e6e4b7b76e4bb9b6249b9..c17031876a9c169dfcf803495d50a439d860fdf9 100644 (file)
--- a/folly/test/SpookyHashV2Test.cpp
+++ b/folly/test/SpookyHashV2Test.cpp
@@ -22,6 +22,7 @@
 
 #include <folly/SpookyHashV2.h>
 #include <folly/Benchmark.h>
 
 #include <folly/SpookyHashV2.h>
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 #include <cinttypes>
 #include <cstdio>
 
 #include <cinttypes>
 #include <cstdio>


@@ -30,8 +31,6 @@
 #include <cstdlib>
 #include <ctime>
 
 #include <cstdlib>
 #include <ctime>
 

-#include <gtest/gtest.h>
-

 using namespace ::folly::hash;
 
 static bool failed = false;
 using namespace ::folly::hash;
 
 static bool failed = false;

diff --git a/folly/test/StringTest.cpp b/folly/test/StringTest.cpp
index a736fbbe65633dd3b46dd9cf62c8cb110ec4f2f5..e1fd686b0d070199717d7e1c4d31e83d46ad231e 100644 (file)
--- a/folly/test/StringTest.cpp
+++ b/folly/test/StringTest.cpp
@@ -23,9 +23,9 @@
 #include <cinttypes>
 
 #include <boost/regex.hpp>
 #include <cinttypes>
 
 #include <boost/regex.hpp>

-#include <gtest/gtest.h>

 
 #include <folly/Array.h>
 
 #include <folly/Array.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace std;
 
 using namespace folly;
 using namespace std;

diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp
index 912b05b7104bd0cbf17a01c2de66b1d80948cab6..66b1831957420556ca4c514deb3aaa919c65dcf7 100644 (file)
--- a/folly/test/SubprocessTest.cpp
+++ b/folly/test/SubprocessTest.cpp
@@ -20,7 +20,6 @@
 
 #include <boost/container/flat_set.hpp>
 #include <glog/logging.h>
 
 #include <boost/container/flat_set.hpp>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Exception.h>
 #include <folly/Format.h>
 
 #include <folly/Exception.h>
 #include <folly/Format.h>


@@ -31,6 +30,7 @@
 #include <folly/gen/String.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/gen/String.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 using namespace folly;
 #include <folly/portability/Unistd.h>
 
 using namespace folly;

diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp
index 4aaeadabd49755aaee38c3e47010fc02916e6922..adbac4194a735f987371cea1e83ed7a072d67edc 100644 (file)
--- a/folly/test/SynchronizedTest.cpp
+++ b/folly/test/SynchronizedTest.cpp
@@ -25,7 +25,7 @@
 #include <folly/SpinLock.h>
 #include <folly/Synchronized.h>
 #include <folly/test/SynchronizedTestLib.h>
 #include <folly/SpinLock.h>
 #include <folly/Synchronized.h>
 #include <folly/test/SynchronizedTestLib.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly::sync_tests;
 
 
 using namespace folly::sync_tests;
 

diff --git a/folly/test/SynchronizedTestLib-inl.h b/folly/test/SynchronizedTestLib-inl.h
index faf60f7cb93176197f2b3f9b739d152dcd6c9346..3bb89c4f0e3516c2324a2afafdd57e3c254dba89 100644 (file)
--- a/folly/test/SynchronizedTestLib-inl.h
+++ b/folly/test/SynchronizedTestLib-inl.h
@@ -16,11 +16,10 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <gtest/gtest.h>
-

 #include <folly/Foreach.h>
 #include <folly/Random.h>
 #include <folly/Synchronized.h>
 #include <folly/Foreach.h>
 #include <folly/Random.h>
 #include <folly/Synchronized.h>

+#include <folly/portability/GTest.h>

 #include <glog/logging.h>
 #include <algorithm>
 #include <condition_variable>
 #include <glog/logging.h>
 #include <algorithm>
 #include <condition_variable>

diff --git a/folly/test/TestUtils.h b/folly/test/TestUtils.h
index 2750f6d045a2e67beb0a8ce2ffc63ca39711fae1..f40885fdad53c76ebac22e595011060ffdf0ecb4 100644 (file)
--- a/folly/test/TestUtils.h
+++ b/folly/test/TestUtils.h
@@ -18,7 +18,7 @@
 
 #include <chrono>
 
 
 #include <chrono>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 // We use this to indicate that tests have failed because of timing
 // or dependencies that may be flakey. Internally this is used by
 
 // We use this to indicate that tests have failed because of timing
 // or dependencies that may be flakey. Internally this is used by

diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index 9332c7397edd5059b4a5d97924e2ca2b0fa7d2c3..8b6a1a7a3539842758b278a50f61b3a48d3f96ff 100644 (file)
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -26,11 +26,11 @@
 #include <unordered_map>
 
 #include <glog/logging.h>
 #include <unordered_map>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Range.h>
 #include <folly/Benchmark.h>
 #include <folly/Portability.h>
 
 #include <folly/Range.h>
 #include <folly/Benchmark.h>
 #include <folly/Portability.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ThreadCachedIntTest.cpp b/folly/test/ThreadCachedIntTest.cpp
index 4f5c377e097933b34233b888a3a49738917425c5..74f6c4dc8d316d12ee15ae2f2e9548ac4c65c36c 100644 (file)
--- a/folly/test/ThreadCachedIntTest.cpp
+++ b/folly/test/ThreadCachedIntTest.cpp
@@ -20,11 +20,11 @@
 #include <thread>
 
 #include <glog/logging.h>
 #include <thread>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/portability/GFlags.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index e2e2fce0ead5a8dced6088e8830eb604f5c86f91..c3a276d255fffe48c31206642df55a90416823f8 100644 (file)
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -35,11 +35,11 @@
 #include <unordered_map>
 
 #include <glog/logging.h>
 #include <unordered_map>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Baton.h>
 #include <folly/Memory.h>
 #include <folly/experimental/io/FsUtil.h>
 
 #include <folly/Baton.h>
 #include <folly/Memory.h>
 #include <folly/experimental/io/FsUtil.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/Unistd.h>
 
 using namespace folly;
 #include <folly/portability/Unistd.h>
 
 using namespace folly;

diff --git a/folly/test/ThreadNameTest.cpp b/folly/test/ThreadNameTest.cpp
index b4618c370939f5428172672e47f30f4018db7559..dd6daca3aa6b502ff3b565cd4d8d8c9e7b10fe68 100644 (file)
--- a/folly/test/ThreadNameTest.cpp
+++ b/folly/test/ThreadNameTest.cpp
@@ -18,7 +18,7 @@
 #include <folly/Baton.h>
 #include <folly/ScopeGuard.h>
 #include <folly/ThreadName.h>
 #include <folly/Baton.h>
 #include <folly/ScopeGuard.h>
 #include <folly/ThreadName.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/TimeoutQueueTest.cpp b/folly/test/TimeoutQueueTest.cpp
index 581bf0d747aa4877b5a7b1f35ff2d4b92ce50c9c..2ac750dfaf8df7fee25e0371da122c8710bb7e23 100644 (file)
--- a/folly/test/TimeoutQueueTest.cpp
+++ b/folly/test/TimeoutQueueTest.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>

 #include <folly/TimeoutQueue.h>
 
 #include <folly/TimeoutQueue.h>
 

+#include <folly/portability/GTest.h>
+

 using namespace folly;
 
 TEST(TimeoutQueue, Simple) {
 using namespace folly;
 
 TEST(TimeoutQueue, Simple) {

diff --git a/folly/test/TimeseriesHistogramTest.cpp b/folly/test/TimeseriesHistogramTest.cpp
index 3cb5ce8bedb0c71617aaf40c7c3e0c1794d03fb7..b672866f34e167b5a60398188bd7df77b0505867 100644 (file)
--- a/folly/test/TimeseriesHistogramTest.cpp
+++ b/folly/test/TimeseriesHistogramTest.cpp
@@ -19,7 +19,7 @@
 
 #include <random>
 
 
 #include <random>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/TimeseriesTest.cpp b/folly/test/TimeseriesTest.cpp
index 91b2c9eef88fc17b170b45e76f79a3fc2d3ba292..69b238458a2395472b09d55f33f419da422ea518 100644 (file)
--- a/folly/test/TimeseriesTest.cpp
+++ b/folly/test/TimeseriesTest.cpp
@@ -22,9 +22,9 @@
 #include <array>
 
 #include <glog/logging.h>
 #include <array>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Foreach.h>
 
 #include <folly/Foreach.h>

+#include <folly/portability/GTest.h>

 
 using std::chrono::seconds;
 using std::string;
 
 using std::chrono::seconds;
 using std::string;

diff --git a/folly/test/TokenBucketTest.cpp b/folly/test/TokenBucketTest.cpp
index 7f0f49533902cff5442a6de2ec699ab35f8e06c2..632337823b9caf79003c8bd48c55bb3ec0adbcc4 100644 (file)
--- a/folly/test/TokenBucketTest.cpp
+++ b/folly/test/TokenBucketTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/test/TokenBucketTest.h>
 
 
 #include <folly/test/TokenBucketTest.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/TokenBucketTest.h b/folly/test/TokenBucketTest.h
index 652d532734cb819f6ee99db8fd0d85465004ddb1..8fc0315125903da1c55571009813a2fe78e7f9df 100644 (file)
--- a/folly/test/TokenBucketTest.h
+++ b/folly/test/TokenBucketTest.h
@@ -16,9 +16,8 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <gtest/gtest.h>
-

 #include <folly/TokenBucket.h>
 #include <folly/TokenBucket.h>

+#include <folly/portability/GTest.h>

 
 namespace folly {
 
 
 namespace folly {
 

diff --git a/folly/test/TraitsTest.cpp b/folly/test/TraitsTest.cpp
index 71b6a17643e63bfeea02df7f610e2a90c5805d1e..a5f1a052822bb259c7996bc9b6d66b97a7fe7837 100644 (file)
--- a/folly/test/TraitsTest.cpp
+++ b/folly/test/TraitsTest.cpp
@@ -22,7 +22,7 @@
 #include <utility>
 
 #include <folly/ScopeGuard.h>
 #include <utility>
 
 #include <folly/ScopeGuard.h>

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 using namespace folly;
 using namespace std;
 
 using namespace folly;
 using namespace std;

diff --git a/folly/test/TryTest.cpp b/folly/test/TryTest.cpp
index e1f2c4e9c65b4448a7660e850377446ec50d1af7..e9b600a35b3c7fe27a1637e8233e5a91b7a04fc1 100644 (file)
--- a/folly/test/TryTest.cpp
+++ b/folly/test/TryTest.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/Memory.h>
 #include <folly/Try.h>
 #include <folly/Memory.h>
 #include <folly/Try.h>

+#include <folly/portability/GTest.h>

 
 using namespace folly;
 
 
 using namespace folly;
 

diff --git a/folly/test/UnitTest.cpp b/folly/test/UnitTest.cpp
index 18ff4ab5db6affe4b00e515e6858dad7cdd8f013..4bfbf8263ca78d3f16b6013b6c98eac6f0b45690 100644 (file)
--- a/folly/test/UnitTest.cpp
+++ b/folly/test/UnitTest.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

-#include <gtest/gtest.h>
-

 #include <folly/Unit.h>
 
 #include <folly/Unit.h>
 

+#include <folly/portability/GTest.h>
+

 using namespace folly;
 
 TEST(Unit, operatorEq) {
 using namespace folly;
 
 TEST(Unit, operatorEq) {

diff --git a/folly/test/UriTest.cpp b/folly/test/UriTest.cpp
index 8d80bbb6fec831c64159e80490449c087039ba15..cd1e8e4fdd6ed3e2e942341088dea1e8d371419a 100644 (file)
--- a/folly/test/UriTest.cpp
+++ b/folly/test/UriTest.cpp
@@ -16,10 +16,10 @@
 
 #include <folly/Uri.h>
 #include <folly/Benchmark.h>
 
 #include <folly/Uri.h>
 #include <folly/Benchmark.h>

+#include <folly/portability/GTest.h>

 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 #include <map>
 
 using namespace folly;
 #include <map>
 
 using namespace folly;

diff --git a/folly/test/VarintTest.cpp b/folly/test/VarintTest.cpp
index e5dd0e6a8873ad8d384e38630532ef8fe60c7a07..647ab73ade31f51a5edcfeb1ced313bd60540e3b 100644 (file)
--- a/folly/test/VarintTest.cpp
+++ b/folly/test/VarintTest.cpp
@@ -22,10 +22,10 @@
 #include <vector>
 
 #include <glog/logging.h>
 #include <vector>
 
 #include <glog/logging.h>

-#include <gtest/gtest.h>

 
 #include <folly/Benchmark.h>
 #include <folly/Random.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Random.h>

+#include <folly/portability/GTest.h>

 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 

diff --git a/folly/test/common/TestMain.cpp b/folly/test/common/TestMain.cpp
index c8e08d8ade83235cc896c007c6614ecd5b413d46..acb53de3808e3e74826e0610af93ba76806911bf 100644 (file)
--- a/folly/test/common/TestMain.cpp
+++ b/folly/test/common/TestMain.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/init/Init.h>
 
 
 #include <folly/init/Init.h>
 

-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>

 
 /*
  * This is the recommended main function for all tests.
 
 /*
  * This is the recommended main function for all tests.

diff --git a/folly/test/small_vector_test.cpp b/folly/test/small_vector_test.cpp
index a7e211662aa2d077ed4ce8c0d85e098ec16f1f2d..6215fd73ea951808840c88b2aad612677fd1d942 100644 (file)
--- a/folly/test/small_vector_test.cpp
+++ b/folly/test/small_vector_test.cpp
@@ -25,9 +25,9 @@
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>

-#include <gtest/gtest.h>

 
 #include <folly/Conv.h>
 
 #include <folly/Conv.h>

+#include <folly/portability/GTest.h>

 #include <folly/portability/TypeTraits.h>
 
 using folly::small_vector;
 #include <folly/portability/TypeTraits.h>
 
 using folly::small_vector;

diff --git a/folly/test/sorted_vector_test.cpp b/folly/test/sorted_vector_test.cpp
index 19a520347c3aad9597d938db5be1d48be2be5e38..5d0dbb150b115ca50c0a1010fefe83cdd2460437 100644 (file)
--- a/folly/test/sorted_vector_test.cpp
+++ b/folly/test/sorted_vector_test.cpp
@@ -15,10 +15,12 @@
  */
 
 #include <folly/sorted_vector_types.h>
  */
 
 #include <folly/sorted_vector_types.h>

-#include <gtest/gtest.h>
+

 #include <list>
 #include <memory>
 
 #include <list>
 #include <memory>
 

+#include <folly/portability/GTest.h>
+

 using folly::sorted_vector_set;
 using folly::sorted_vector_map;
 
 using folly::sorted_vector_set;
 using folly::sorted_vector_map;
 

diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 685ad4066b99ee35ebbc3b7a65c0a9d0e56b57bc..022d5fb31213afa803fdc9e007b026b6f58ccc5c 100644 (file)
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -181,13 +181,13 @@ THOUGHTS:
 #include <cstddef>
 #include <iomanip>
 
 #include <cstddef>
 #include <iomanip>
 

-#include <gtest/gtest.h>

 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/preprocessor.hpp>
 
 #include <folly/Conv.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/GFlags.h>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/preprocessor.hpp>
 
 #include <folly/Conv.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/GFlags.h>

+#include <folly/portability/GTest.h>

 
 using namespace std;
 using namespace folly;
 
 using namespace std;
 using namespace folly;