Updating test case single_core_request to be for only Windows pre Dev14.

stgates · stgates · commit e52cb91a1290 · 2015-04-06T21:12:08.000-07:00
diff --git a/Release/tests/functional/http/listener/connections_and_errors.cpp b/Release/tests/functional/http/listener/connections_and_errors.cpp
@@ -143,12 +143,11 @@ TEST_FIXTURE(uri_address, save_request_reply)
     listener.close().wait();
 }
 
+#if defined(_WIN32) && _MSC_VER < 1900
 TEST_FIXTURE(uri_address, single_core_request)
 {
-#ifdef _MSC_VER
 	// Fake having a scheduler with only 1 core.
 	concurrency::CurrentScheduler::Create(concurrency::SchedulerPolicy(2, 1, Concurrency::MinConcurrency, 1, Concurrency::MaxConcurrency));
-#endif
 
 	http_listener listener(m_uri);
 	listener.open().wait();
@@ -173,10 +172,9 @@ TEST_FIXTURE(uri_address, single_core_request)
 
 	listener.close().wait();
 
-#ifdef _MSC_VER
 	concurrency::CurrentScheduler::Detach();
-#endif
 }
+#endif
 
 TEST_FIXTURE(uri_address, save_request_response)
 {

Original file line number	Diff line number	Diff line change
`@@ -143,12 +143,11 @@ TEST_FIXTURE(uri_address, save_request_reply)`
`143`	`143`	`listener.close().wait();`
`144`	`144`	`}`
`145`	`145`
	`146`	`+#if defined(_WIN32) && _MSC_VER < 1900`
`146`	`147`	`TEST_FIXTURE(uri_address, single_core_request)`
`147`	`148`	`{`
`148`		`-#ifdef _MSC_VER`
`149`	`149`	`// Fake having a scheduler with only 1 core.`
`150`	`150`	`concurrency::CurrentScheduler::Create(concurrency::SchedulerPolicy(2, 1, Concurrency::MinConcurrency, 1, Concurrency::MaxConcurrency));`
`151`		`-#endif`
`152`	`151`
`153`	`152`	`http_listener listener(m_uri);`
`154`	`153`	`listener.open().wait();`
`@@ -173,10 +172,9 @@ TEST_FIXTURE(uri_address, single_core_request)`
`173`	`172`
`174`	`173`	`listener.close().wait();`
`175`	`174`
`176`		`-#ifdef _MSC_VER`
`177`	`175`	`concurrency::CurrentScheduler::Detach();`
`178`		`-#endif`
`179`	`176`	`}`
	`177`	`+#endif`
`180`	`178`
`181`	`179`	`TEST_FIXTURE(uri_address, save_request_response)`
`182`	`180`	`{`