Fold some tests into the runtime tests

Author: smallp-o-p

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp

@@ -194,15 +194,6 @@ void test_rt() {
   }
 
   TestTypes::TestType::reset();
-}
-
-int main(int, char**) {
-  test();
-  static_assert(test());
-
-  {
-    test_rt();
-  }
 
   {
     test_throwing_ctor();
@@ -213,6 +204,15 @@ int main(int, char**) {
     test_reference_extension();
   }
 #endif
+}
+
+int main(int, char**) {
+  test();
+  static_assert(test());
+
+  {
+    test_rt();
+  }
 
   return 0;
 }

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp

@@ -226,6 +226,16 @@ bool test_rt() {
     static_assert(std::is_nothrow_move_constructible<optional<NoThrowMove>>::value, "");
   }
 
+  {
+    test_throwing_ctor();
+  }
+
+#if TEST_STD_VER >= 26
+  {
+    test_reference_extension();
+  }
+#endif
+
   return true;
 }
 
@@ -237,13 +247,5 @@ int main(int, char**) {
     test_rt();
   }
 
-  {
-    test_throwing_ctor();
-  }
-
-  {
-    test_reference_extension();
-  }
-
   return 0;
 }

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp

@@ -47,6 +47,20 @@ constexpr void test_rvalueT(U arg) {
   };
 }
 
+TEST_CONSTEXPR_CXX26 void test_throwing() {
+#ifndef TEST_HAS_NO_EXCEPTIONS
+  {
+    try {
+      Z z(3);
+      optional<Z> opt(std::move(z));
+      assert(false);
+    } catch (int i) {
+      assert(i == 6);
+    }
+  }
+#endif
+}
+
 void test_rt() {
   {
     typedef TestTypes::TestType T;
@@ -57,6 +71,7 @@ void test_rt() {
     assert(static_cast<bool>(opt) == true);
     assert(opt.value().value == 3);
   }
+
   {
     typedef ExplicitTestTypes::TestType T;
     static_assert(!std::is_convertible<T&&, optional<T>>::value, "");
@@ -67,6 +82,7 @@ void test_rt() {
     assert(static_cast<bool>(opt) == true);
     assert(opt.value().value == 3);
   }
+
   {
     typedef TestTypes::TestType T;
     T::reset();
@@ -78,20 +94,10 @@ void test_rt() {
     assert(static_cast<bool>(opt) == true);
     assert(opt.value().value == 3);
   }
-}
 
-TEST_CONSTEXPR_CXX26 void test_throwing() {
-#ifndef TEST_HAS_NO_EXCEPTIONS
   {
-    try {
-      Z z(3);
-      optional<Z> opt(std::move(z));
-      assert(false);
-    } catch (int i) {
-      assert(i == 6);
-    }
+    test_throwing();
   }
-#endif
 }
 
 constexpr bool test() {
@@ -132,9 +138,5 @@ int main(int, char**) {
     test_rt();
   }
 
-  {
-    test_throwing();
-  }
-
   return 0;
 }