fix flaky ConnectTFOTimeout and ConnectTFOFallbackTimeout tests

[folly.git] / folly / test / BitIteratorTest.cpp

diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index 965d906923b5b97b2023ccffacb2e43abcaf809e..fdf49b219c62f260090f4819565d02be8550fe7e 100644 (file)
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-#include "folly/Bits.h"
-#include "folly/Benchmark.h"
+#include <folly/Bits.h>
 
 #include <algorithm>
 #include <type_traits>
 #include <limits>
 #include <vector>
+
 #include <gtest/gtest.h>
 
-#include <gflags/gflags.h>
+#include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 using namespace folly::bititerator_detail;
@@ -178,7 +179,7 @@ runRealFFSTest                             19  2.011 s   105.9 ms  9.447
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();