Merge pull request #61411 from al45tair/eng/PR-100707643

swift-ci · web-flow · commit c2f89cd9c864 · 2022-10-03T04:12:10.000-07:00
[Threading][Tests] Don't test timeouts on threading=none.
diff --git a/unittests/Threading/ConditionVariable.cpp b/unittests/Threading/ConditionVariable.cpp
@@ -54,6 +54,7 @@ TEST(ConditionVariableTest, CriticalSectionThreaded) {
   criticalSectionThreaded(cond);
 }
 
+#if !SWIFT_THREADING_NONE
 // Check that timeouts work
 TEST(ConditionVariableTest, Timeout) {
   using namespace std::chrono_literals;
@@ -95,7 +96,6 @@ TEST(ConditionVariableTest, Timeout) {
   ASSERT_GE(duration.count(), 0.5);
 }
 
-#if !SWIFT_THREADING_NONE
 // Check that signal() wakes exactly one waiter
 TEST(ConditionVariableTest, Signal) {
   ConditionVariable cond;

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ TEST(ConditionVariableTest, CriticalSectionThreaded) {`
`54`	`54`	`criticalSectionThreaded(cond);`
`55`	`55`	`}`
`56`	`56`
	`57`	`+#if !SWIFT_THREADING_NONE`
`57`	`58`	`// Check that timeouts work`
`58`	`59`	`TEST(ConditionVariableTest, Timeout) {`
`59`	`60`	`using namespace std::chrono_literals;`
`@@ -95,7 +96,6 @@ TEST(ConditionVariableTest, Timeout) {`
`95`	`96`	`ASSERT_GE(duration.count(), 0.5);`
`96`	`97`	`}`
`97`	`98`
`98`		`-#if !SWIFT_THREADING_NONE`
`99`	`99`	`// Check that signal() wakes exactly one waiter`
`100`	`100`	`TEST(ConditionVariableTest, Signal) {`
`101`	`101`	`ConditionVariable cond;`