Don't do #if in the middle of a parameter to a preprocessor macro

Summary: Because MSVC doesn't let you do this. Separate the tests out and disable the entire thing instead.

Reviewed By: yfeldblum

Differential Revision: D3513174

fbshipit-source-id: 7411418204083f172883ca96eff3785c912a9647

diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp
index fd2b2521f7f39893cc37a025aae94d52c4a122a2..27805c7b3cfb8d8c717916a4fa11d11bad81fcdb 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest.cpp
@@ -485,6 +485,10 @@ class NextProtocolTest : public testing::TestWithParam<NextProtocolTypePair> {
   std::unique_ptr<NpnServer> server;
 };
 
+class NextProtocolTLSExtTest : public NextProtocolTest {
+  // For extended TLS protos
+};
+
 class NextProtocolNPNOnlyTest : public NextProtocolTest {
   // For mismatching protos
 };
@@ -609,7 +613,18 @@ INSTANTIATE_TEST_CASE_P(
         NextProtocolTypePair(
             SSLContext::NextProtocolType::NPN,
             SSLContext::NextProtocolType::NPN),
+        NextProtocolTypePair(
+            SSLContext::NextProtocolType::NPN,
+            SSLContext::NextProtocolType::ANY),
+        NextProtocolTypePair(
+            SSLContext::NextProtocolType::ANY,
+            SSLContext::NextProtocolType::ANY)));
+
 #if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+INSTANTIATE_TEST_CASE_P(
+    AsyncSSLSocketTest,
+    NextProtocolTLSExtTest,
+    ::testing::Values(
         NextProtocolTypePair(
             SSLContext::NextProtocolType::ALPN,
             SSLContext::NextProtocolType::ALPN),
@@ -618,14 +633,8 @@ INSTANTIATE_TEST_CASE_P(
             SSLContext::NextProtocolType::ANY),
         NextProtocolTypePair(
             SSLContext::NextProtocolType::ANY,
-            SSLContext::NextProtocolType::ALPN),
+            SSLContext::NextProtocolType::ALPN)));
 #endif
-        NextProtocolTypePair(
-            SSLContext::NextProtocolType::NPN,
-            SSLContext::NextProtocolType::ANY),
-        NextProtocolTypePair(
-            SSLContext::NextProtocolType::ANY,
-            SSLContext::NextProtocolType::ANY)));
 
 INSTANTIATE_TEST_CASE_P(
     AsyncSSLSocketTest,