Merge branch 'evanc/mshpccasablanca' into staging

kavyako · kavyako · commit 7afda2723e70 · 2015-10-07T16:04:19.000-07:00
diff --git a/Release/tests/functional/http/listener/listener_construction_tests.cpp b/Release/tests/functional/http/listener/listener_construction_tests.cpp
@@ -430,6 +430,8 @@ TEST_FIXTURE(uri_address, listener_config_creation)
     }
 }
 
+#if !defined(_WIN32) && !defined(__cplusplus_winrt)
+
 TEST_FIXTURE(uri_address, create_https_listener_get)
 {
     const char * self_signed_cert = R"(

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,8 @@ TEST_FIXTURE(uri_address, listener_config_creation)`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`
	`433`	`+#if !defined(_WIN32) && !defined(__cplusplus_winrt)`
	`434`	`+`
`433`	`435`	`TEST_FIXTURE(uri_address, create_https_listener_get)`
`434`	`436`	`{`
`435`	`437`	`const char * self_signed_cert = R"(`