Fix some copyright lines in folly/

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

diff --git a/folly/test/FormatOtherTest.cpp b/folly/test/FormatOtherTest.cpp
index 97d2db102e38439d9862f653882b4d336328cc78..427d01d7b883cf7448327cbc6eba78c21f72cab3 100644 (file)
--- a/folly/test/FormatOtherTest.cpp
+++ b/folly/test/FormatOtherTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2015-present Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@
 
 #include <folly/Format.h>
 
+#include <glog/logging.h>
+
 #include <folly/FBVector.h>
 #include <folly/FileUtil.h>
+#include <folly/Portability.h>
 #include <folly/dynamic.h>
 #include <folly/json.h>
+#include <folly/portability/GTest.h>
 #include <folly/small_vector.h>
 
-#include <glog/logging.h>
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
-
 using namespace folly;
 
 TEST(FormatOther, file) {
@@ -34,7 +34,13 @@ TEST(FormatOther, file) {
   {
     int fds[2];
     CHECK_ERR(pipe(fds));
-    SCOPE_EXIT { closeNoInt(fds[1]); };
+    SCOPE_EXIT {
+      // fclose on Windows automatically closes the underlying
+      // file descriptor.
+      if (!kIsWindows) {
+        closeNoInt(fds[1]);
+      }
+    };
     {
       FILE* fp = fdopen(fds[1], "wb");
       PCHECK(fp);
@@ -90,7 +96,7 @@ void testFormatSeq() {
   EXPECT_EQ("10 20 0030", svformat("{} {} {:04}", v));
 }
 
-}  // namespace
+} // namespace
 
 TEST(FormatOther, fbvector) {
   testFormatSeq<fbvector<int>>();