Use the GTest portability headers v2016.09.12.00 v2016.09.12.01
authorChristopher Dykes <cdykes@fb.com>
Sat, 10 Sep 2016 00:44:01 +0000 (17:44 -0700)
committerFacebook Github Bot <facebook-github-bot-bot@fb.com>
Sat, 10 Sep 2016 00:56:06 +0000 (17:56 -0700)
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

221 files changed:
folly/experimental/bser/test/BserTest.cpp
folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp
folly/experimental/io/test/AsyncIOTest.cpp
folly/experimental/io/test/FsUtilTest.cpp
folly/experimental/observer/test/ObserverTest.cpp
folly/experimental/symbolizer/test/DwarfTests.cpp
folly/experimental/symbolizer/test/ElfTests.cpp
folly/experimental/symbolizer/test/LineReaderTest.cpp
folly/experimental/symbolizer/test/SignalHandlerTest.cpp
folly/experimental/symbolizer/test/StackTraceTest.cpp
folly/experimental/symbolizer/test/SymbolizerTest.cpp
folly/experimental/test/AutoTimerTest.cpp
folly/experimental/test/BitsTest.cpp
folly/experimental/test/CodingTestUtils.h
folly/experimental/test/DynamicParserTest.cpp
folly/experimental/test/EventCountTest.cpp
folly/experimental/test/FunctionSchedulerTest.cpp
folly/experimental/test/FutureDAGTest.cpp
folly/experimental/test/JSONSchemaTest.cpp
folly/experimental/test/LockFreeRingBufferTest.cpp
folly/experimental/test/NestedCommandLineAppTest.cpp
folly/experimental/test/ProgramOptionsTest.cpp
folly/experimental/test/ReadMostlySharedPtrTest.cpp
folly/experimental/test/RefCountTest.cpp
folly/experimental/test/StringKeyedTest.cpp
folly/experimental/test/TestUtilTest.cpp
folly/experimental/test/TupleOpsTest.cpp
folly/fibers/test/FibersTest.cpp
folly/futures/test/BarrierTest.cpp
folly/futures/test/CollectTest.cpp
folly/futures/test/ContextTest.cpp
folly/futures/test/ConversionTest.cpp
folly/futures/test/CoreTest.cpp
folly/futures/test/EnsureTest.cpp
folly/futures/test/ExecutorTest.cpp
folly/futures/test/FSMTest.cpp
folly/futures/test/FilterTest.cpp
folly/futures/test/FutureTest.cpp
folly/futures/test/HeaderCompileTest.cpp
folly/futures/test/InterruptTest.cpp
folly/futures/test/MapTest.cpp
folly/futures/test/NonCopyableLambdaTest.cpp
folly/futures/test/PollTest.cpp
folly/futures/test/PromiseTest.cpp
folly/futures/test/ReduceTest.cpp
folly/futures/test/RetryingTest.cpp
folly/futures/test/SelfDestructTest.cpp
folly/futures/test/SharedPromiseTest.cpp
folly/futures/test/ThenCompileTest.h
folly/futures/test/ThenTest.cpp
folly/futures/test/TimekeeperTest.cpp
folly/futures/test/TimesTest.cpp
folly/futures/test/UnwrapTest.cpp
folly/futures/test/ViaTest.cpp
folly/futures/test/WaitTest.cpp
folly/futures/test/WhenTest.cpp
folly/futures/test/WhileDoTest.cpp
folly/futures/test/WillEqualTest.cpp
folly/futures/test/WindowTest.cpp
folly/gen/test/BaseTest.cpp
folly/gen/test/CombineTest.cpp
folly/gen/test/FileTest.cpp
folly/gen/test/ParallelMapTest.cpp
folly/gen/test/ParallelTest.cpp
folly/gen/test/StringTest.cpp
folly/io/async/ssl/test/SSLErrorsTest.cpp
folly/io/async/test/AsyncPipeTest.cpp
folly/io/async/test/AsyncSSLSocketTest.cpp
folly/io/async/test/AsyncSSLSocketTest.h
folly/io/async/test/AsyncSSLSocketTest2.cpp
folly/io/async/test/AsyncSSLSocketWriteTest.cpp
folly/io/async/test/AsyncSocketExceptionTest.cpp
folly/io/async/test/AsyncSocketTest.cpp
folly/io/async/test/AsyncSocketTest2.cpp
folly/io/async/test/AsyncTimeoutTest.cpp
folly/io/async/test/AsyncTransportTest.cpp
folly/io/async/test/AsyncUDPSocketTest.cpp
folly/io/async/test/DelayedDestructionBaseTest.cpp
folly/io/async/test/DelayedDestructionTest.cpp
folly/io/async/test/EventBaseLocalTest.cpp
folly/io/async/test/EventHandlerTest.cpp
folly/io/async/test/HHWheelTimerSlowTests.cpp
folly/io/async/test/HHWheelTimerTest.cpp
folly/io/async/test/NotificationQueueTest.cpp
folly/io/async/test/RequestContextTest.cpp
folly/io/async/test/ScopedEventBaseThreadTest.cpp
folly/io/async/test/Util.h
folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
folly/io/test/CompressionTest.cpp
folly/io/test/IOBufCursorTest.cpp
folly/io/test/IOBufQueueTest.cpp
folly/io/test/IOBufTest.cpp
folly/io/test/RecordIOTest.cpp
folly/io/test/ShutdownSocketSetTest.cpp
folly/portability/test/ConstexprTest.cpp
folly/portability/test/LibgenTest.cpp
folly/portability/test/TimeTest.cpp
folly/ssl/test/OpenSSLHashTest.cpp
folly/test/AHMIntStressTest.cpp
folly/test/ApplyTupleTest.cpp
folly/test/ArenaSmartPtrTest.cpp
folly/test/ArenaTest.cpp
folly/test/ArrayTest.cpp
folly/test/AsciiCaseInsensitiveTest.cpp
folly/test/AtomicBitSetTest.cpp
folly/test/AtomicHashArrayTest.cpp
folly/test/AtomicHashMapTest.cpp
folly/test/AtomicLinkedListTest.cpp
folly/test/AtomicStructTest.cpp
folly/test/AtomicUnorderedMapTest.cpp
folly/test/BatonBenchmark.cpp
folly/test/BatonTest.cpp
folly/test/BatonTestHelpers.h
folly/test/BitIteratorTest.cpp
folly/test/BitsTest.cpp
folly/test/CacheLocalityTest.cpp
folly/test/CachelinePaddedTest.cpp
folly/test/CallOnceTest.cpp
folly/test/ChecksumTest.cpp
folly/test/ClockGettimeWrappersTest.cpp
folly/test/ConcurrentSkipListTest.cpp
folly/test/ContainerTraitsTest.cpp
folly/test/ConvTest.cpp
folly/test/CpuIdTest.cpp
folly/test/DemangleTest.cpp
folly/test/DeterministicScheduleTest.cpp
folly/test/DiscriminatedPtrTest.cpp
folly/test/DynamicConverterTest.cpp
folly/test/DynamicOtherTest.cpp
folly/test/DynamicTest.cpp
folly/test/EndianTest.cpp
folly/test/EnumerateTest.cpp
folly/test/EvictingCacheMapTest.cpp
folly/test/ExceptionTest.cpp
folly/test/ExceptionWrapperTest.cpp
folly/test/ExpectedTest.cpp
folly/test/FBStringTest.cpp
folly/test/FBVectorBenchmark.cpp
folly/test/FBVectorTest.cpp
folly/test/FileLockTest.cpp
folly/test/FileTest.cpp
folly/test/FileUtilTest.cpp
folly/test/FingerprintTest.cpp
folly/test/ForeachBenchmark.cpp
folly/test/ForeachTest.cpp
folly/test/FormatOtherTest.cpp
folly/test/FormatTest.cpp
folly/test/FunctionSchedulerTest.cpp
folly/test/FunctionTest.cpp
folly/test/FutexTest.cpp
folly/test/GroupVarintTest.cpp
folly/test/HasMemberFnTraitsTest.cpp
folly/test/HashTest.cpp
folly/test/HistogramTest.cpp
folly/test/IPAddressTest.cpp
folly/test/IPAddressTest.h
folly/test/IndestructibleTest.cpp
folly/test/IndexedMemPoolTest.cpp
folly/test/JsonOtherTest.cpp
folly/test/JsonTest.cpp
folly/test/LazyTest.cpp
folly/test/LifoSemTests.cpp
folly/test/LockTraitsTest.cpp
folly/test/LoggingTest.cpp
folly/test/MPMCPipelineTest.cpp
folly/test/MPMCQueueTest.cpp
folly/test/MacAddressTest.cpp
folly/test/MallctlHelperTest.cpp
folly/test/MapUtilTest.cpp
folly/test/MathTest.cpp
folly/test/MemcpyTest.cpp
folly/test/MemoryIdlerTest.cpp
folly/test/MemoryMappingTest.cpp
folly/test/MemoryTest.cpp
folly/test/MergeTest.cpp
folly/test/MoveWrapperTest.cpp
folly/test/OptionalTest.cpp
folly/test/PackedSyncPtrTest.cpp
folly/test/PaddedTest.cpp
folly/test/PartialTest.cpp
folly/test/PortabilityTest.cpp
folly/test/ProducerConsumerQueueTest.cpp
folly/test/RWSpinLockTest.cpp
folly/test/RandomTest.cpp
folly/test/RangeTest.cpp
folly/test/SafeAssertTest.cpp
folly/test/ScopeGuardTest.cpp
folly/test/SharedMutexTest.cpp
folly/test/SingletonTest.cpp
folly/test/SingletonTestGlobal.cpp
folly/test/SingletonTestStructs.h
folly/test/SingletonVaultCTest.cpp
folly/test/SmallLocksTest.cpp
folly/test/SocketAddressTest.cpp
folly/test/SparseByteSetTest.cpp
folly/test/SpinLockTest.cpp
folly/test/SpookyHashV1Test.cpp
folly/test/SpookyHashV2Test.cpp
folly/test/StringTest.cpp
folly/test/SubprocessTest.cpp
folly/test/SynchronizedTest.cpp
folly/test/SynchronizedTestLib-inl.h
folly/test/TestUtils.h
folly/test/ThreadCachedArenaTest.cpp
folly/test/ThreadCachedIntTest.cpp
folly/test/ThreadLocalTest.cpp
folly/test/ThreadNameTest.cpp
folly/test/TimeoutQueueTest.cpp
folly/test/TimeseriesHistogramTest.cpp
folly/test/TimeseriesTest.cpp
folly/test/TokenBucketTest.cpp
folly/test/TokenBucketTest.h
folly/test/TraitsTest.cpp
folly/test/TryTest.cpp
folly/test/UnitTest.cpp
folly/test/UriTest.cpp
folly/test/VarintTest.cpp
folly/test/common/TestMain.cpp
folly/test/small_vector_test.cpp
folly/test/sorted_vector_test.cpp
folly/test/stl_tests/StlVectorTest.cpp

index e2672cb..8534d53 100644 (file)
@@ -15,7 +15,7 @@
  */
 #include <folly/experimental/bser/Bser.h>
 #include <folly/String.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::dynamic;
 
index 37d6392..24b413e 100644 (file)
@@ -21,9 +21,8 @@
 #include <condition_variable>
 #include <sstream>
 
-#include <gtest/gtest.h>
-
 #include <folly/experimental/exception_tracer/ExceptionCounterLib.h>
+#include <folly/portability/GTest.h>
 
 struct MyException {};
 
index eae19c1..f7272d4 100644 (file)
 #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/portability/GTest.h>
 #include <folly/portability/Sockets.h>
 
 namespace fs = folly::fs;
index 2278987..fd23b90 100644 (file)
@@ -17,7 +17,8 @@
 #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;
index 6ace420..c2be17b 100644 (file)
  * 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 <folly/portability/GTest.h>
 
 using namespace folly::observer;
 
index 676bedd..00834ee 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/experimental/symbolizer/Dwarf.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::symbolizer::Dwarf;
 
index 84d526c..32ef4e0 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/experimental/symbolizer/Elf.h>
+#include <folly/portability/GTest.h>
 
 using folly::symbolizer::ElfFile;
 
index 61a748b..3e82572 100644 (file)
 #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/portability/GTest.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
index 77b642c..fa0e472 100644 (file)
 #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/portability/GTest.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
index 9a58c61..c4fe7f7 100644 (file)
@@ -18,7 +18,8 @@
 #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;
index efcb404..66435cb 100644 (file)
 
 #include <cstdlib>
 
-#include <gtest/gtest.h>
-
 #include <folly/Range.h>
 #include <folly/String.h>
+#include <folly/portability/GTest.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
index de8e313..f4c71c5 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
 #include <folly/experimental/AutoTimer.h>
 
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 using namespace std;
 
index b09a768..58a5a5a 100644 (file)
@@ -17,7 +17,8 @@
 #include <folly/experimental/Bits.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index d16f31e..7789df1 100644 (file)
@@ -24,7 +24,8 @@
 #include <vector>
 #include <unordered_set>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 namespace folly { namespace compression {
 
index 39bc575..38db303 100644 (file)
@@ -25,7 +25,7 @@
 #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;
index b525760..e01fa1f 100644 (file)
@@ -22,9 +22,9 @@
 #include <thread>
 #include <vector>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Random.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 8e0ea8e..e54d1b4 100644 (file)
@@ -20,7 +20,8 @@
 #include <cassert>
 #include <random>
 #include <folly/Random.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using std::chrono::milliseconds;
index 1fb947a..c15a8a2 100644 (file)
@@ -15,7 +15,7 @@
  */
 #include <boost/thread/barrier.hpp>
 #include <folly/experimental/FutureDAG.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 84f3fa9..04a7a09 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <folly/experimental/JSONSchema.h>
 #include <folly/json.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::dynamic;
 using folly::parseJson;
index 14b373d..edd666b 100644 (file)
  * 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 <folly/portability/GTest.h>
 
 namespace folly {
 
index b52ab80..d4b749c 100644 (file)
@@ -18,8 +18,8 @@
 
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/GTest.h>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace test {
 
index 9dd175c..c54dd54 100644 (file)
@@ -19,8 +19,8 @@
 #include <folly/FileUtil.h>
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/GTest.h>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace test {
 
index 4f68358..ffbe0d4 100644 (file)
 #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/portability/GTest.h>
 
 using folly::ReadMostlyMainPtr;
 using folly::ReadMostlyWeakPtr;
index a9b0814..440f25e 100644 (file)
@@ -18,8 +18,7 @@
 #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 {
 
index dd05d0a..446e74a 100644 (file)
 #include <string>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Range.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 
 using folly::StringKeyedMap;
 using folly::StringKeyedSetBase;
index 3110f6f..79046e0 100644 (file)
 
 #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/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::test;
index 24df7b2..80071ea 100644 (file)
@@ -17,8 +17,9 @@
 #include <folly/experimental/TupleOps.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/GTest.h>
+
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace test {
 
index bbb5ddc..2a05fd4 100644 (file)
@@ -17,8 +17,6 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.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/portability/GTest.h>
 
 using namespace folly::fibers;
 
index 47a3e3d..8e4f789 100644 (file)
@@ -21,8 +21,9 @@
 #include <mutex>
 
 #include <folly/Random.h>
+#include <folly/portability/GTest.h>
+
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace futures { namespace test {
 
index 673161a..f7cb1b9 100644 (file)
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #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/portability/GTest.h>
 
 using namespace folly;
 
index e5946b2..0451a80 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 53b15b1..e300c4e 100644 (file)
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
+
 #include <type_traits>
 
 using namespace folly;
index c65a76d..7d2dc1b 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
 #include <folly/futures/detail/Core.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 6212202..925f96f 100644 (file)
@@ -17,9 +17,8 @@
 #include <memory>
 #include <unordered_set>
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index b11a8a6..9730ef4 100644 (file)
  * 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/portability/GTest.h>
 
 using namespace folly;
 
index 1dd4f6b..6f315dd 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/detail/FSM.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly::detail;
 
index 9159587..a8baf56 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index a025dba..8a66184 100644 (file)
  * 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/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 #include <algorithm>
index ae2e5de..f2fe836 100644 (file)
  * 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>
+#include <folly/portability/GTest.h>
 
 TEST(Basic, compiles) {
   EXPECT_TRUE(true);
index 16a8e08..5c599b0 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <folly/Baton.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 743a082..e972ded 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 73bc6dc..b499400 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index ae82fed..c518d45 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 126518c..89431a2 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using std::unique_ptr;
index bf613ef..c5462dd 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index a57507c..6988e5d 100644 (file)
 #include <atomic>
 #include <exception>
 #include <vector>
+
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
-#include <gtest/gtest.h>
 
 using namespace std;
 using namespace std::chrono;
index 68a75d0..4638eae 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index b75e9f0..36b5169 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/SharedPromise.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 75eb26b..2769ced 100644 (file)
@@ -16,9 +16,8 @@
 
 #pragma once
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 #include <memory>
 
index 4ba5398..11f59b0 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 #include <thread>
 
index c20668c..676d635 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Timekeeper.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 using namespace folly;
index 84549c1..8354ef9 100644 (file)
 #include <mutex>
 #include <queue>
 
-#include <gtest/gtest.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index be259f8..521b296 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index c864b90..765fdf6 100644 (file)
  * 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/portability/GTest.h>
 
 #include <thread>
 
index 816f48f..380c130 100644 (file)
 
 #include <queue>
 
-#include <gtest/gtest.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;
index bd8e076..3563c42 100644 (file)
 #include <memory>
 #include <mutex>
 
-#include <gtest/gtest.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 3c3fcc2..15fdfbf 100644 (file)
 #include <mutex>
 #include <queue>
 
-#include <gtest/gtest.h>
 #include <glog/logging.h>
 
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index a560ab5..315210e 100644 (file)
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 6eecedc..f614c5f 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <boost/thread/barrier.hpp>
 
 #include <folly/Conv.h>
 #include <folly/futures/Future.h>
+#include <folly/portability/GTest.h>
 
 #include <vector>
 
index 66b987e..f779c4a 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
 #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/portability/GTest.h>
 
 using namespace folly::gen;
 using namespace folly;
index b98bdf0..3b89946 100644 (file)
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gtest/gtest.h>
 #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/portability/GTest.h>
 
 using namespace folly::gen;
 using namespace folly;
index a62f2ed..00c5635 100644 (file)
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gtest/gtest.h>
 #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/portability/GTest.h>
 
 using namespace folly::gen;
 using namespace folly;
index 954a9f3..503b027 100644 (file)
 #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/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::gen;
index ad4f608..995eab0 100644 (file)
  */
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
 #include <iostream>
 #include <array>
 #include <vector>
+
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::gen;
index 65c7946..11f34b0 100644 (file)
  */
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
 #include <iosfwd>
 #include <map>
 #include <vector>
 
 #include <folly/gen/String.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly::gen;
 using namespace folly;
index f651ace..6643cf2 100644 (file)
@@ -16,7 +16,8 @@
 
 #include <folly/io/async/ssl/SSLErrors.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
index 2a9c426..81569dc 100644 (file)
@@ -17,7 +17,7 @@
 #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>
 
index e5dbed1..0920122 100644 (file)
@@ -22,6 +22,7 @@
 #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>
 
@@ -29,7 +30,6 @@
 
 #include <fcntl.h>
 #include <folly/io/Cursor.h>
-#include <gtest/gtest.h>
 #include <openssl/bio.h>
 #include <sys/types.h>
 #include <fstream>
index d961809..7ae4aeb 100644 (file)
 #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 <gtest/gtest.h>
 #include <sys/types.h>
 #include <condition_variable>
 #include <iostream>
index e39f3b7..e33df0a 100644 (file)
  */
 #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 <folly/portability/GTest.h>
 
 using std::string;
 using std::vector;
index 13270a6..9b67ba3 100644 (file)
@@ -19,8 +19,8 @@
 #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>
 
index 50c6659..d3c25d1 100644 (file)
@@ -17,7 +17,8 @@
 
 #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;
index bd348bd..261f6f2 100644 (file)
@@ -18,8 +18,7 @@
 #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 {
 
index bc27b24..afd4f9e 100644 (file)
 #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 <gtest/gtest.h>
 #include <sys/types.h>
 #include <iostream>
 #include <thread>
index 18592b7..463fb3a 100644 (file)
@@ -16,8 +16,7 @@
 
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/EventBase.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 namespace folly {
 
index 8a7f525..815ba7f 100644 (file)
@@ -17,8 +17,7 @@
 #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;
 
index 27ac844..acaf76b 100644 (file)
 #include <boost/thread/barrier.hpp>
 
 #include <folly/io/IOBuf.h>
+#include <folly/portability/GTest.h>
 
 #include <thread>
 
-#include <gtest/gtest.h>
-
 using folly::AsyncUDPSocket;
 using folly::AsyncUDPServerSocket;
 using folly::AsyncTimeout;
index 1d7ab3f..580b2e5 100644 (file)
 #include <folly/io/async/DelayedDestructionBase.h>
 
 #include <functional>
-#include <gtest/gtest.h>
 #include <list>
 #include <vector>
 
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 class DestructionOnCallback : public DelayedDestructionBase {
index e4a3e1b..d7836b9 100644 (file)
@@ -15,7 +15,7 @@
  */
 #include <folly/io/async/DelayedDestruction.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 4d570ad..50b5ecd 100644 (file)
@@ -34,7 +34,7 @@
 
 #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):
index 255f214..0c3e80c 100644 (file)
@@ -23,8 +23,8 @@
 #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 <gtest/gtest.h>
 #include <sys/eventfd.h>
 
 using namespace std;
index 20a40cf..3c412fb 100644 (file)
@@ -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/portability/GTest.h>
 
-#include <gtest/gtest.h>
 #include <thread>
 #include <vector>
 
index 0ee8212..d265f34 100644 (file)
@@ -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/portability/GTest.h>
 
-#include <gtest/gtest.h>
 #include <vector>
 
 using namespace folly;
index c24e684..bd7a54a 100644 (file)
@@ -18,6 +18,8 @@
 #include <folly/io/async/ScopedEventBaseThread.h>
 
 #include <folly/Baton.h>
+#include <folly/portability/GTest.h>
+
 #include <list>
 #include <iostream>
 #include <thread>
@@ -27,8 +29,6 @@
 #include <sys/wait.h>
 #endif
 
-#include <gtest/gtest.h>
-
 using namespace std;
 using namespace folly;
 
index 1f5c5e6..0ca773c 100644 (file)
  * 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 <folly/portability/GTest.h>
 
 using namespace folly;
 
index 81589cb..9d92ea8 100644 (file)
@@ -18,8 +18,7 @@
 
 #include <chrono>
 #include <folly/Baton.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace std::chrono;
index 8f54274..02d0670 100644 (file)
@@ -20,7 +20,7 @@
 
 #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.
index 0baac51..e75a931 100644 (file)
  * 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/portability/GTest.h>
 
 using namespace testing;
 using testing::_;
index d0d35af..7de7617 100644 (file)
 
 #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/portability/GTest.h>
 
 namespace folly { namespace io { namespace test {
 
index 08cb23d..5c607ad 100644 (file)
@@ -19,8 +19,7 @@
 #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;
index 2606218..737c4bf 100644 (file)
@@ -20,9 +20,8 @@
 #include <stdexcept>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include <folly/Range.h>
+#include <folly/portability/GTest.h>
 
 using folly::IOBuf;
 using folly::IOBufQueue;
index c012deb..a615496 100644 (file)
 #include <cstddef>
 
 #include <boost/random.hpp>
-#include <gtest/gtest.h>
 
 #include <folly/Malloc.h>
 #include <folly/Range.h>
+#include <folly/portability/GTest.h>
 
 using folly::fbstring;
 using folly::fbvector;
index 9154b8a..79985b5 100644 (file)
@@ -21,7 +21,6 @@
 #include <random>
 
 #include <glog/logging.h>
-#include <gtest/gtest.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/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
index 0b1e144..1ddebdb 100644 (file)
@@ -20,8 +20,8 @@
 #include <thread>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
+#include <folly/portability/GTest.h>
 #include <folly/portability/Sockets.h>
 
 using folly::ShutdownSocketSet;
index 1bf7438..37f5132 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/portability/Constexpr.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 namespace {
 
index 9d258a5..737f1bf 100755 (executable)
@@ -16,8 +16,7 @@
 
 #include <string>
 
-#include <gtest/gtest.h>
-
+#include <folly/portability/GTest.h>
 #include <folly/portability/Libgen.h>
 
 TEST(Libgen, dirname) {
index 83ecc0c..0df8f2b 100644 (file)
 #include <folly/portability/Time.h>
 
 #include <folly/test/TestUtils.h>
+#include <folly/portability/GTest.h>
 
 #include <chrono>
 
-#include <gtest/gtest.h>
-
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;
index 129cf40..1e2c9e6 100644 (file)
@@ -16,9 +16,8 @@
 
 #include <folly/ssl/OpenSSLHash.h>
 
-#include <gtest/gtest.h>
-
 #include <folly/io/IOBufQueue.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index 7fc6251..dbe7d95 100644 (file)
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <thread>
 #include <memory>
 #include <mutex>
@@ -23,6 +21,7 @@
 #include <folly/AtomicHashMap.h>
 #include <folly/ScopeGuard.h>
 #include <folly/Memory.h>
+#include <folly/portability/GTest.h>
 
 namespace {
 
index e29c991..8aff7d0 100644 (file)
@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <folly/ApplyTuple.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 #include <array>
 #include <memory>
index e49d270..1ac482d 100644 (file)
@@ -20,8 +20,7 @@
 
 #include <folly/Memory.h>
 #include <folly/Arena.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 93d74e8..b754f97 100644 (file)
 
 #include <folly/Arena.h>
 #include <folly/Memory.h>
+#include <folly/portability/GTest.h>
 
 #include <set>
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 using namespace folly;
 
index 2bfc73a..c50270d 100644 (file)
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <folly/Array.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 #include <string>
 
 using namespace std;
index ec7f078..86ebd7b 100644 (file)
@@ -17,7 +17,7 @@
 #include <folly/Range.h>
 
 #include <folly/portability/GFlags.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 #include <algorithm>
 
 using namespace std;
index 3823ad2..57c50be 100644 (file)
@@ -16,8 +16,9 @@
 
 #include <folly/AtomicBitSet.h>
 
+#include <folly/portability/GTest.h>
+
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace test {
 
index 9e53635..b6b9e9a 100644 (file)
@@ -23,7 +23,7 @@
 #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;
index 32ad64d..c395539 100644 (file)
@@ -17,7 +17,6 @@
 #include <folly/AtomicHashMap.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 #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/portability/GTest.h>
 #include <folly/portability/SysTime.h>
 
 using std::vector;
index b13c24c..ad09e12 100644 (file)
@@ -17,9 +17,8 @@
 #include <algorithm>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include <folly/AtomicLinkedList.h>
+#include <folly/portability/GTest.h>
 
 class TestIntrusiveObject {
  public:
index b6d0a07..554722e 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/AtomicStruct.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index c9c4238..e1a0104 100644 (file)
 #include <thread>
 #include <unordered_map>
 
-#include <gtest/gtest.h>
-
 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
index 099226a..b261ac9 100644 (file)
 #include <semaphore.h>
 #include <thread>
 
-#include <gtest/gtest.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>
 
index eaeb5ad..4fbc695 100644 (file)
 #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 <gtest/gtest.h>
 
 using namespace folly;
 using namespace folly::test;
index 0d86b36..7efbd3e 100644 (file)
@@ -18,8 +18,7 @@
 
 #include <folly/Baton.h>
 #include <folly/test/DeterministicSchedule.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 namespace folly {
 namespace test {
index fdf49b2..f9b2b1d 100644 (file)
 #include <limits>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include <folly/Benchmark.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::bititerator_detail;
index 2b2a140..4f6ed67 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <folly/Bits.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 33af739..dd46e79 100644 (file)
 
 #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 <gtest/gtest.h>
 
 using namespace folly::detail;
 
index 9eca058..c67c316 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <type_traits>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::CachelinePadded;
 
index 4a4b291..843fa48 100644 (file)
@@ -20,9 +20,9 @@
 
 #include <folly/CallOnce.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 DEFINE_int32(threads, 16, "benchmark concurrency");
 
index a82bf75..3e93e9f 100644 (file)
 
 #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/portability/GTest.h>
 
 namespace {
 const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t);
index 8516d6d..4d1950a 100644 (file)
 #include <folly/ClockGettimeWrappers.h>
 
 #include <folly/test/TestUtils.h>
+#include <folly/portability/GTest.h>
 
 #include <chrono>
 
-#include <gtest/gtest.h>
-
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;
index b63be00..cdd72ac 100644 (file)
 #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/portability/GTest.h>
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
 
index d3894e3..4ca5a81 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/ContainerTraits.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index fd26293..878171a 100644 (file)
 #endif
 
 #include <boost/lexical_cast.hpp>
+
 #include <folly/Conv.h>
 #include <folly/Foreach.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+
 #include <algorithm>
 #include <cinttypes>
 #include <limits>
index 28c43e7..c1465aa 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/CpuId.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 1316319..78c9933 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/Demangle.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::demangle;
 
index db22703..7153f2b 100644 (file)
@@ -16,9 +16,8 @@
 
 #include <folly/test/DeterministicSchedule.h>
 
-#include <gtest/gtest.h>
-
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly::test;
 
index 916b794..338621d 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/DiscriminatedPtr.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 1d45e67..942f6b2 100644 (file)
@@ -18,8 +18,9 @@
 
 #include <folly/DynamicConverter.h>
 
+#include <folly/portability/GTest.h>
+
 #include <algorithm>
-#include <gtest/gtest.h>
 #include <map>
 #include <vector>
 
index bf3b462..df75529 100644 (file)
@@ -19,8 +19,7 @@
 #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>
 
index 0fa5bdc..624118e 100644 (file)
@@ -16,8 +16,9 @@
 
 #include <folly/dynamic.h>
 
+#include <folly/portability/GTest.h>
+
 #include <boost/next_prior.hpp>
-#include <gtest/gtest.h>
 
 using folly::dynamic;
 
index f57bea9..93b0390 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/Bits.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 47ae5cd..b3ed18d 100644 (file)
@@ -20,7 +20,7 @@
 
 #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"};
index 7991a4c..0c30590 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <set>
 
 #include <folly/EvictingCacheMap.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index a77725d..cc0378c 100644 (file)
 #include <folly/Exception.h>
 
 #include <folly/experimental/TestUtil.h>
+#include <folly/portability/GTest.h>
 
 #include <cstdio>
 #include <memory>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 namespace folly { namespace test {
 
index a3b17e0..dc3a0ac 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
 #include <stdexcept>
+
 #include <folly/ExceptionWrapper.h>
 #include <folly/Conv.h>
 #include <folly/Portability.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 52c0903..a10c9e8 100644 (file)
@@ -16,6 +16,7 @@
 
 #include <folly/Expected.h>
 #include <folly/Portability.h>
+#include <folly/portability/GTest.h>
 
 #include <algorithm>
 #include <iomanip>
@@ -25,7 +26,6 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 using std::unique_ptr;
 using std::shared_ptr;
index c6945a1..a31038f 100644 (file)
 #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/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index 0b67691..cd95037 100644 (file)
@@ -24,8 +24,8 @@
 #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>
index 33a164a..54f64ef 100644 (file)
@@ -22,8 +22,8 @@
 #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>
index eaf302e..eb25bfb 100644 (file)
@@ -19,7 +19,6 @@
 #include <mutex>
 
 #include <glog/logging.h>
-#include <gtest/gtest.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/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::test;
index 290c53d..4651f7b 100644 (file)
@@ -18,8 +18,7 @@
 
 #include <folly/String.h>
 #include <folly/portability/Fcntl.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 6526efa..26cfde9 100644 (file)
 #include <deque>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/File.h>
 #include <folly/Range.h>
 #include <folly/String.h>
+#include <folly/portability/GTest.h>
 
 namespace folly { namespace test {
 
index 94a5740..62de048 100644 (file)
 #include <folly/Fingerprint.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/detail/SlowFingerprint.h>
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::detail;
index dfb2444..e3a96f0 100644 (file)
@@ -17,8 +17,8 @@
 #include <folly/Foreach.h>
 
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
-#include <gtest/gtest.h>
 #include <map>
 
 using namespace folly;
index bba0413..9904084 100644 (file)
@@ -16,7 +16,8 @@
 
 #include <folly/Foreach.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+
 #include <map>
 #include <string>
 #include <vector>
index 9513216..466d3c6 100644 (file)
 #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/portability/GTest.h>
 
 using namespace folly;
 
index d1d8c96..f8e27e3 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/Format.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 #include <string>
 
index 4fed1e9..bfe2afb 100644 (file)
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 #include <atomic>
-#include <gtest/gtest.h>
 
 #include <folly/experimental/FunctionScheduler.h>
+#include <folly/portability/GTest.h>
 
 namespace folly {
 
index 1c18e48..b23eb3e 100644 (file)
@@ -20,7 +20,7 @@
 #include <folly/Function.h>
 
 #include <folly/Memory.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::Function;
 
index 36d11f8..da7dca3 100644 (file)
@@ -23,9 +23,9 @@
 #include <thread>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/portability/Time.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly::detail;
 using namespace folly::test;
index 8b05713..2f2dcf8 100644 (file)
@@ -21,7 +21,7 @@
 // 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;
 
index dc8c0f9..2414eee 100644 (file)
@@ -20,7 +20,8 @@
 
 #include <folly/Traits.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
+
 #include <glog/logging.h>
 
 #include <string>
index 62618d3..e2c8e38 100644 (file)
@@ -16,7 +16,7 @@
 
 #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>
index 680d8c0..c7b233c 100644 (file)
@@ -17,7 +17,7 @@
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::Histogram;
 
index 5097eaf..9fc746d 100644 (file)
 
 #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/portability/GTest.h>
 
 using namespace folly;
 using namespace std;
index 01aa3c4..20633b1 100644 (file)
 
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include <sys/types.h>
 
 #include <folly/IPAddress.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Sockets.h>
 
 namespace folly {
index 6ee8005..4e144ee 100644 (file)
@@ -20,8 +20,9 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <gtest/gtest.h>
+
 #include <folly/Memory.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index 03e24ee..1cfa690 100644 (file)
 
 #include <folly/IndexedMemPool.h>
 #include <folly/test/DeterministicSchedule.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
+
 #include <string>
 #include <thread>
 #include <semaphore.h>
-#include <gtest/gtest.h>
 
 using namespace folly;
 using namespace folly::test;
index 01fd4cf..dd1a5b8 100644 (file)
@@ -19,8 +19,7 @@
 #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;
index a57b493..805cb30 100644 (file)
@@ -16,8 +16,9 @@
 #include <limits>
 
 #include <boost/next_prior.hpp>
+
 #include <folly/json.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using folly::dynamic;
 using folly::parseJson;
index 373d224..5a11ff9 100644 (file)
@@ -19,7 +19,7 @@
 #include <functional>
 #include <iostream>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 namespace folly {
 
index 09234c9..c16fe4a 100644 (file)
 #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/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
index d77d820..677a651 100644 (file)
 #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 <folly/portability/GTest.h>
 
 using namespace folly;
 
index 734640d..9b752c5 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/Logging.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 #include <vector>
 
index 1914b67..aed9f96 100644 (file)
@@ -20,9 +20,9 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/GTest.h>
 
 namespace folly { namespace test {
 
index f4a195a..cc9e8c1 100644 (file)
@@ -17,6 +17,7 @@
 #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>
@@ -28,8 +29,6 @@
 #include <thread>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 FOLLY_ASSUME_FBVECTOR_COMPATIBLE_1(boost::intrusive_ptr);
 
 using namespace folly;
index b97ea21..ae70a9c 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/Conv.h>
 #include <folly/IPAddressV6.h>
 #include <folly/MacAddress.h>
+#include <folly/portability/GTest.h>
 
 using folly::MacAddress;
 using folly::IPAddressV6;
index ad66599..04236c8 100644 (file)
@@ -17,7 +17,7 @@
 #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;
 
index 7ba12a9..4584faf 100644 (file)
@@ -17,7 +17,8 @@
 #include <folly/MapUtil.h>
 
 #include <map>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 166d2a7..60c6b2b 100644 (file)
@@ -22,9 +22,9 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Portability.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::detail;
index f6635f4..9c4a141 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/Portability.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 namespace {
 
index d1536d0..74e377a 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <folly/Baton.h>
 #include <folly/portability/GMock.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Windows.h>
 
 #include <memory>
@@ -25,8 +26,6 @@
 #include <assert.h>
 #include <semaphore.h>
 
-#include <gtest/gtest.h>
-
 using namespace folly;
 using namespace folly::detail;
 using namespace testing;
index 1d80cd2..f438c66 100644 (file)
 #include <folly/FileUtil.h>
 #include <folly/MemoryMapping.h>
 #include <folly/Random.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/SysMman.h>
 
-#include <gtest/gtest.h>
-
 static constexpr double kSomeDouble = 3.14;
 
 namespace folly {
index c35e40b..d766047 100644 (file)
@@ -17,9 +17,9 @@
 #include <folly/Memory.h>
 #include <folly/Arena.h>
 #include <folly/String.h>
+#include <folly/portability/GTest.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <type_traits>
 
index 880c5e9..ae0693b 100644 (file)
  */
 
 #include <folly/Merge.h>
-#include <gtest/gtest.h>
+
 #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};
index 74b283e..168af64 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/MoveWrapper.h>
+
 #include <memory>
 
+#include <folly/portability/GTest.h>
+
 namespace folly {
 
 TEST(makeMoveWrapper, Empty) {
index 0fc31e0..96f6e5c 100644 (file)
@@ -16,6 +16,7 @@
 
 #include <folly/Optional.h>
 #include <folly/Portability.h>
+#include <folly/portability/GTest.h>
 
 #include <memory>
 #include <vector>
@@ -25,7 +26,6 @@
 #include <type_traits>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 #include <boost/optional.hpp>
 
 using std::unique_ptr;
index c5b28b2..b83dd67 100644 (file)
 #include <folly/PackedSyncPtr.h>
 
 #include <cinttypes>
-#include <gtest/gtest.h>
 #include <thread>
 #include <unordered_map>
 #include <utility>
 
+#include <folly/portability/GTest.h>
+
 using folly::PackedSyncPtr;
 
 namespace {
index b86e209..017a02d 100644 (file)
@@ -17,7 +17,8 @@
 #include <folly/Padded.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 025cd25..1d19e02 100644 (file)
@@ -17,7 +17,8 @@
 #include <memory>
 
 #include <folly/Partial.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 using folly::partial;
 
index 8ff47aa..58d104d 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 class Base {
  public:
index bd1fa0c..4fe0a66 100644 (file)
@@ -23,7 +23,8 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+
+#include <folly/portability/GTest.h>
 
 //////////////////////////////////////////////////////////////////////
 
index a6a4041..edf037b 100644 (file)
@@ -25,9 +25,9 @@
 #include <thread>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 DEFINE_int32(num_threads, 8, "num threads");
index d7c4f4a..7d175b6 100644 (file)
 #include <folly/Random.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <algorithm>
 #include <thread>
 #include <vector>
 #include <random>
 
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 TEST(Random, StateSize) {
index 0a1d03a..ef4c1e1 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <folly/Range.h>
 
+#include <folly/portability/GTest.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 <gtest/gtest.h>
 
 using namespace folly;
 using namespace folly::detail;
index bfaa3dd..0cb59b9 100644 (file)
@@ -17,9 +17,9 @@
 #include <folly/SafeAssert.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 93507da..892a435 100644 (file)
 #include <folly/ScopeGuard.h>
 #include <folly/Portability.h>
 
-#include <gtest/gtest.h>
 #include <glog/logging.h>
 
 #include <functional>
 #include <stdexcept>
 
+#include <folly/portability/GTest.h>
+
 using folly::ScopeGuard;
 using folly::makeGuard;
 using std::vector;
index 7ca5523..dc0274c 100644 (file)
@@ -20,7 +20,6 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
 #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/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
index 627c954..6e8b232 100644 (file)
 #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 <gtest/gtest.h>
 #include <boost/thread/barrier.hpp>
 
 using namespace folly;
index 7410d5f..d62f41d 100644 (file)
@@ -20,9 +20,9 @@
 #include <folly/Singleton.h>
 #include <folly/Benchmark.h>
 #include <folly/test/SingletonTestStructs.h>
+#include <folly/portability/GTest.h>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 /*
  * This test needs to be in its own file, as a standalone program.
index fecf537..d8a90c9 100644 (file)
@@ -20,7 +20,8 @@
 #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
index 00e9f5b..471cc35 100644 (file)
 #include <folly/Singleton.h>
 #include <folly/SingletonVault_c.h>
 
-#include <gtest/gtest.h>
-
 #include <thread>
 
+#include <folly/portability/GTest.h>
+
 FOLLY_TLS long instance_counter_instances = 0;
 
 class InstanceCounter {
index 41c2ce6..020c713 100644 (file)
@@ -28,9 +28,8 @@
 
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include <folly/portability/Asm.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 using folly::MSLGuard;
index 145aa86..200f725 100644 (file)
 
 #include <folly/SocketAddress.h>
 
-#include <gtest/gtest.h>
 #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>
index f5f6f1a..418d797 100644 (file)
@@ -21,7 +21,7 @@
 #include <random>
 #include <set>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index 6d028af..0312240 100644 (file)
 
 #include <folly/Random.h>
 
-#include <gtest/gtest.h>
 #include <thread>
 
 #include <folly/portability/Asm.h>
+#include <folly/portability/GTest.h>
 
 using folly::SpinLockGuardImpl;
 
index 9748a75..4b81ce1 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <folly/SpookyHashV1.h>
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
 #include <cinttypes>
 #include <cstdio>
@@ -30,8 +31,6 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <gtest/gtest.h>
-
 using namespace ::folly::hash;
 
 static bool failed = false;
index 65503ba..c170318 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <folly/SpookyHashV2.h>
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
 #include <cinttypes>
 #include <cstdio>
@@ -30,8 +31,6 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <gtest/gtest.h>
-
 using namespace ::folly::hash;
 
 static bool failed = false;
index a736fbb..e1fd686 100644 (file)
@@ -23,9 +23,9 @@
 #include <cinttypes>
 
 #include <boost/regex.hpp>
-#include <gtest/gtest.h>
 
 #include <folly/Array.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace std;
index 912b05b..66b1831 100644 (file)
@@ -20,7 +20,6 @@
 
 #include <boost/container/flat_set.hpp>
 #include <glog/logging.h>
-#include <gtest/gtest.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/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 using namespace folly;
index 4aaeada..adbac41 100644 (file)
@@ -25,7 +25,7 @@
 #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;
 
index faf60f7..3bb89c4 100644 (file)
 
 #pragma once
 
-#include <gtest/gtest.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>
index 2750f6d..f40885f 100644 (file)
@@ -18,7 +18,7 @@
 
 #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
index 9332c73..8b6a1a7 100644 (file)
 #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/portability/GTest.h>
 
 using namespace folly;
 
index 4f5c377..74f6c4d 100644 (file)
 #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/portability/GTest.h>
 
 using namespace folly;
 
index e2e2fce..c3a276d 100644 (file)
 #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/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 
 using namespace folly;
index b4618c3..dd6daca 100644 (file)
@@ -18,7 +18,7 @@
 #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;
index 581bf0d..2ac750d 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
 #include <folly/TimeoutQueue.h>
 
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 TEST(TimeoutQueue, Simple) {
index 3cb5ce8..b672866 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <random>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;
index 91b2c9e..69b2384 100644 (file)
@@ -22,9 +22,9 @@
 #include <array>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Foreach.h>
+#include <folly/portability/GTest.h>
 
 using std::chrono::seconds;
 using std::string;
index 7f0f495..6323378 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/test/TokenBucketTest.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 652d532..8fc0315 100644 (file)
@@ -16,9 +16,8 @@
 
 #pragma once
 
-#include <gtest/gtest.h>
-
 #include <folly/TokenBucket.h>
+#include <folly/portability/GTest.h>
 
 namespace folly {
 
index 71b6a17..a5f1a05 100644 (file)
@@ -22,7 +22,7 @@
 #include <utility>
 
 #include <folly/ScopeGuard.h>
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace std;
index e1f2c4e..e9b600a 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/Memory.h>
 #include <folly/Try.h>
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 
index 18ff4ab..4bfbf82 100644 (file)
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <folly/Unit.h>
 
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 TEST(Unit, operatorEq) {
index 8d80bbb..cd1e8e4 100644 (file)
 
 #include <folly/Uri.h>
 #include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 #include <map>
 
 using namespace folly;
index e5dd0e6..647ab73 100644 (file)
 #include <vector>
 
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Random.h>
+#include <folly/portability/GTest.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
index c8e08d8..acb53de 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <folly/init/Init.h>
 
-#include <gtest/gtest.h>
+#include <folly/portability/GTest.h>
 
 /*
  * This is the recommended main function for all tests.
index a7e2116..6215fd7 100644 (file)
@@ -25,9 +25,9 @@
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/GTest.h>
 #include <folly/portability/TypeTraits.h>
 
 using folly::small_vector;
index 19a5203..5d0dbb1 100644 (file)
  */
 
 #include <folly/sorted_vector_types.h>
-#include <gtest/gtest.h>
+
 #include <list>
 #include <memory>
 
+#include <folly/portability/GTest.h>
+
 using folly::sorted_vector_set;
 using folly::sorted_vector_map;
 
index 685ad40..022d5fb 100644 (file)
@@ -181,13 +181,13 @@ THOUGHTS:
 #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 <folly/portability/GTest.h>
 
 using namespace std;
 using namespace folly;