From: Christopher Dykes <cdykes@fb.com>
Date: Sat, 2 Jul 2016 04:33:07 +0000 (-0700)
Subject: Include the correct headers in various tests
X-Git-Tag: 2016.07.26~82
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a49866e66310a9940c7e262807602a170bbc93f5;p=folly.git

Include the correct headers in various tests

Summary: There are two types of includes this adds. The first are standard library headers that weer previously included by transitive dependencies, but aren't included under MSVC, so need to be explicitly included. The second type is a couple of portability headers.

Reviewed By: yfeldblum

Differential Revision: D3513196

fbshipit-source-id: 4f2ac1207aee887ba41c19f5490003e5fe4088f4
---

diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index dc587982..96572114 100644
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <boost/regex.hpp>
 #include <folly/Conv.h>
@@ -28,6 +27,7 @@
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Fcntl.h>
 #include <folly/portability/Unistd.h>
 
 namespace folly {
diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp
index 7b1eeda3..845d96fd 100644
--- a/folly/experimental/test/TestUtilTest.cpp
+++ b/folly/experimental/test/TestUtilTest.cpp
@@ -23,10 +23,12 @@
 #include <system_error>
 
 #include <boost/algorithm/string.hpp>
-#include <folly/Memory.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
+#include <folly/Memory.h>
+#include <folly/portability/Environment.h>
+
 using namespace folly;
 using namespace folly::test;
 
diff --git a/folly/futures/test/CollectTest.cpp b/folly/futures/test/CollectTest.cpp
index 2b7ca5bb..5f05a0b6 100644
--- a/folly/futures/test/CollectTest.cpp
+++ b/folly/futures/test/CollectTest.cpp
@@ -16,6 +16,8 @@
 
 #include <gtest/gtest.h>
 
+#include <numeric>
+
 #include <boost/thread/barrier.hpp>
 
 #include <folly/futures/Future.h>
diff --git a/folly/io/async/test/SocketPair.cpp b/folly/io/async/test/SocketPair.cpp
index 7d0cafd1..e2eae1b1 100644
--- a/folly/io/async/test/SocketPair.cpp
+++ b/folly/io/async/test/SocketPair.cpp
@@ -19,10 +19,10 @@
 #include <folly/io/async/test/SocketPair.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/Fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 
-#include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <stdexcept>
diff --git a/folly/io/async/test/TimeUtil.h b/folly/io/async/test/TimeUtil.h
index 8378a0e0..89bd42f9 100644
--- a/folly/io/async/test/TimeUtil.h
+++ b/folly/io/async/test/TimeUtil.h
@@ -18,6 +18,8 @@
 #include <chrono>
 #include <iostream>
 
+#include <folly/portability/SysTypes.h>
+
 namespace folly {
 
 class TimePoint {
diff --git a/folly/test/AtomicLinkedListTest.cpp b/folly/test/AtomicLinkedListTest.cpp
index 62f3dc60..0abe82c6 100644
--- a/folly/test/AtomicLinkedListTest.cpp
+++ b/folly/test/AtomicLinkedListTest.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <thread>
 
 #include <gtest/gtest.h>
diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp
index 86682c5e..36d11f8e 100644
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -24,7 +24,8 @@
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include <time.h>
+
+#include <folly/portability/Time.h>
 
 using namespace folly::detail;
 using namespace folly::test;
diff --git a/folly/test/MemoryIdlerTest.cpp b/folly/test/MemoryIdlerTest.cpp
index ed4a35fa..bcf3fd6c 100644
--- a/folly/test/MemoryIdlerTest.cpp
+++ b/folly/test/MemoryIdlerTest.cpp
@@ -17,6 +17,7 @@
 #include <folly/detail/MemoryIdler.h>
 
 #include <folly/Baton.h>
+#include <folly/portability/Windows.h>
 
 #include <memory>
 #include <thread>
diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp
index 5aef9ea1..41c2ce65 100644
--- a/folly/test/SmallLocksTest.cpp
+++ b/folly/test/SmallLocksTest.cpp
@@ -25,13 +25,13 @@
 #include <string>
 #include <vector>
 #include <pthread.h>
-#include <unistd.h>
 
 #include <thread>
 
 #include <gtest/gtest.h>
 
 #include <folly/portability/Asm.h>
+#include <folly/portability/Unistd.h>
 
 using folly::MSLGuard;
 using folly::MicroLock;
diff --git a/folly/test/ThreadLocalBenchmark.cpp b/folly/test/ThreadLocalBenchmark.cpp
index a3ea1e53..88691e13 100644
--- a/folly/test/ThreadLocalBenchmark.cpp
+++ b/folly/test/ThreadLocalBenchmark.cpp
@@ -16,9 +16,7 @@
 
 #include <folly/ThreadLocal.h>
 
-#include <dlfcn.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 
 #include <array>
 #include <atomic>
diff --git a/folly/test/TimeseriesHistogramTest.cpp b/folly/test/TimeseriesHistogramTest.cpp
index 45bcd416..489c277d 100644
--- a/folly/test/TimeseriesHistogramTest.cpp
+++ b/folly/test/TimeseriesHistogramTest.cpp
@@ -17,6 +17,8 @@
 #include <folly/stats/TimeseriesHistogram.h>
 #include <folly/stats/TimeseriesHistogram-defs.h>
 
+#include <random>
+
 #include <gtest/gtest.h>
 
 using namespace std;
diff --git a/folly/test/TimeseriesTest.cpp b/folly/test/TimeseriesTest.cpp
index 85ec1b89..91b2c9ee 100644
--- a/folly/test/TimeseriesTest.cpp
+++ b/folly/test/TimeseriesTest.cpp
@@ -19,6 +19,8 @@
 #include <folly/stats/MultiLevelTimeSeries.h>
 #include <folly/stats/MultiLevelTimeSeries-defs.h>
 
+#include <array>
+
 #include <glog/logging.h>
 #include <gtest/gtest.h>