From: Christopher Dykes <cdykes@fb.com>
Date: Mon, 21 Nov 2016 23:39:27 +0000 (-0800)
Subject: Disable the DoubleRegistrationLogging singleton test under MSVC
X-Git-Tag: v2016.11.28.00~14
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=45c9e441b90b8673476362e36c653810d6d91385;p=folly.git

Disable the DoubleRegistrationLogging singleton test under MSVC

Summary: It's the only test in the file that is dependent on Subprocess, which is currently unsupported under MSVC.

Reviewed By: yfeldblum

Differential Revision: D4214812

fbshipit-source-id: 9dcd9763b51d037e0c452f79f134df286a11e718
---

diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index fe579484..36eb9f6b 100644
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -17,13 +17,16 @@
 #include <thread>
 
 #include <folly/Singleton.h>
-#include <folly/Subprocess.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>
 
+#ifndef _MSC_VER
+#include <folly/Subprocess.h>
+#endif
+
 #include <glog/logging.h>
 #include <boost/thread/barrier.hpp>
 
@@ -594,6 +597,8 @@ TEST(Singleton, MockTest) {
   vault.destroyInstances();
 }
 
+#ifndef _MSC_VER
+// Subprocess isn't currently supported under MSVC.
 TEST(Singleton, DoubleRegistrationLogging) {
   const auto basename = "singleton_double_registration";
   const auto sub = fs::executable_path().remove_filename() / basename;
@@ -610,6 +615,7 @@ TEST(Singleton, DoubleRegistrationLogging) {
   EXPECT_EQ(SIGABRT, res.killSignal());
   EXPECT_THAT(err, testing::StartsWith("Double registration of singletons"));
 }
+#endif
 
 // Singleton using a non default constructor test/example:
 struct X {