8 files changed, 5 insertions, 43 deletions
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
index cca875d1a6ba..769a825df001 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
@@ -58,6 +54,7 @@ coro_t f(int n) {
     co_return;
   }
   int val = co_await A{};
+  ((void)val);
   set_value(42);
 }
 
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
index e51ac67f0fef..9c3becffc0ac 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
@@ -9,13 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// FIXME: When run under UBSAN this test hits an assertion inside Clang
-// XFAIL: ubsan
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/expected.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp
index b6832b0c1886..77070cc5a3b0 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/expected.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/fullexpr-dtor.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/fullexpr-dtor.pass.cpp
index c7e34fe919e1..20bcf60fbf00 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/fullexpr-dtor.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/fullexpr-dtor.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
@@ -67,6 +63,7 @@ coro2 a() {
     assert(alive == 1);
     assert(ctor_called == 1);
     assert(dtor_called == 0);
+    ((void)x);
   }
   assert(alive == 0);
   assert(dtor_called == 1);
@@ -75,7 +72,7 @@ coro2 a() {
 coro2 b() {
   reset();
   {
-    co_await Bug{};
+    (void)(co_await Bug{});
     assert(ctor_called == 1);
     assert(dtor_called == 1);
     assert(alive == 0);
@@ -102,7 +99,7 @@ coro2 c() {
 coro2 d() {
   reset();
   {
-    co_yield 42;
+    (void)(co_yield 42);
     assert(ctor_called == 1);
     assert(dtor_called == 1);
     assert(alive == 0);
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/generator.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
index 4681793ed814..9200fae91576 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/generator.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
@@ -9,13 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// FIXME: When run under UBSAN this test hits an assertion inside Clang
-// XFAIL: ubsan
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <vector>
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/go.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp
index e0d69104fdaf..1fdf2c8558eb 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/go.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
@@ -166,9 +162,7 @@ goroutine pusher(channel& left, channel& right)
   }
 }
 
-const int N = 100; //100'000'000;
-const int repeat = 1;
-
+const int N = 100;
 channel* c = new channel[N + 1];
 
 int main() {
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp
index e13196c253ea..e3c96530335d 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <cassert>
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.sh.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
index 9c94f73b2a70..d5f2c40e2a79 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.sh.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
@@ -9,10 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// REQUIRES: fcoroutines-ts
-
-// RUN: %build -fcoroutines-ts
-// RUN: %run
 
 #include <experimental/coroutine>
 #include <vector>