Add constexpr boilerplate to tests

Author: vinay-deshmukh

libcxx/test/std/containers/associative/multimap/empty.pass.cpp

@@ -10,15 +10,16 @@
 
 // class multimap
 
-// bool empty() const;
+// bool empty() const; // constexpr since C++26
 
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef std::multimap<int, double> M;
     M m;
@@ -40,5 +41,13 @@ int main(int, char**) {
   }
 #endif
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/get_allocator.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// allocator_type get_allocator() const
+// allocator_type get_allocator() const // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -19,7 +19,8 @@
 #include "test_allocator.h"
 #include "test_macros.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   typedef std::pair<const int, std::string> ValueType;
   {
     std::allocator<ValueType> alloc;
@@ -32,5 +33,13 @@ int main(int, char**) {
     assert(m.get_allocator() == alloc);
   }
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/incomplete_type.pass.cpp

@@ -26,11 +26,21 @@ struct A {
 
 inline bool operator==(A const& L, A const& R) { return &L == &R; }
 inline bool operator<(A const& L, A const& R) { return L.data < R.data; }
-int main(int, char**) {
+
+TEST_CONSTEXPR_CXX26
+bool test() {
   A a;
 
   // Make sure that the allocator isn't rebound to and incomplete type
   std::multimap<int, int, std::less<int>, complete_type_allocator<std::pair<const int, int> > > m;
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/iterator.pass.cpp

@@ -10,20 +10,22 @@
 
 // class multimap
 
-//       iterator begin();
-// const_iterator begin() const;
-//       iterator end();
-// const_iterator end()   const;
+//       iterator begin(); // constexpr since C++26
+// const_iterator begin() const; // constexpr since C++26
+//       iterator end(); // constexpr since C++26
+// const_iterator end()   const; // constexpr since C++26
+
 //
-//       reverse_iterator rbegin();
-// const_reverse_iterator rbegin() const;
-//       reverse_iterator rend();
-// const_reverse_iterator rend()   const;
+//       reverse_iterator rbegin(); // constexpr since C++26
+// const_reverse_iterator rbegin() const; // constexpr since C++26
+//       reverse_iterator rend(); // constexpr since C++26
+// const_reverse_iterator rend()   const; // constexpr since C++26
+
 //
-// const_iterator         cbegin()  const;
-// const_iterator         cend()    const;
-// const_reverse_iterator crbegin() const;
-// const_reverse_iterator crend()   const;
+// const_iterator         cbegin()  const; // constexpr since C++26
+// const_iterator         cend()    const; // constexpr since C++26
+// const_reverse_iterator crbegin() const; // constexpr since C++26
+// const_reverse_iterator crend()   const; // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -32,7 +34,8 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef std::pair<const int, double> V;
     V ar[] = {V(1, 1),   V(1, 1.5), V(1, 2),   V(2, 1),   V(2, 1.5), V(2, 2),   V(3, 1),   V(3, 1.5),
@@ -165,5 +168,13 @@ int main(int, char**) {
   }
 #endif
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/max_size.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// size_type max_size() const;
+// size_type max_size() const; // constexpr since C++26
 
 #include <cassert>
 #include <limits>
@@ -20,7 +20,8 @@
 #include "test_allocator.h"
 #include "test_macros.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   typedef std::pair<const int, int> KV;
   {
     typedef limited_allocator<KV, 10> A;
@@ -45,5 +46,13 @@ int main(int, char**) {
     assert(c.max_size() <= alloc_max_size(c.get_allocator()));
   }
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// explicit multimap(const allocator_type& a);
+// explicit multimap(const allocator_type& a); // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -19,7 +19,8 @@
 #include "test_allocator.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef std::less<int> C;
     typedef test_allocator<std::pair<const int, double> > A;
@@ -47,5 +48,14 @@ int main(int, char**) {
   }
 #endif
 
+  return true;
+}
+
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp

@@ -12,15 +12,16 @@
 
 // class multimap
 
-// multimap& operator=(initializer_list<value_type> il);
+// multimap& operator=(initializer_list<value_type> il); // constexpr since C++26
 
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef std::multimap<int, double> C;
     typedef C::value_type V;
@@ -58,5 +59,13 @@ int main(int, char**) {
     assert(*++i == V(3, 2));
   }
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// explicit multimap(const key_compare& comp);
+// explicit multimap(const key_compare& comp); // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -19,7 +19,8 @@
 #include "../../../test_compare.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef test_less<int> C;
     const std::multimap<int, double, C> m(C(3));
@@ -37,5 +38,13 @@ int main(int, char**) {
   }
 #endif
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// multimap(const key_compare& comp, const allocator_type& a);
+// multimap(const key_compare& comp, const allocator_type& a); // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -20,7 +20,8 @@
 #include "test_allocator.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26
+bool test() {
   {
     typedef test_less<int> C;
     typedef test_allocator<std::pair<const int, double> > A;
@@ -51,5 +52,13 @@ int main(int, char**) {
   }
 #endif
 
+  return true;
+}
+int main(int, char**) {
+  assert(test());
+
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp

@@ -10,7 +10,7 @@
 
 // class multimap
 
-// multimap(const multimap& m);
+// multimap(const multimap& m); // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -83,7 +83,8 @@ void test_alloc() {
   }
 }
 
-void test() {
+TEST_CONSTEXPR_CXX26
+bool test() {
   test_alloc<std::allocator>();
   test_alloc<min_allocator>(); // Make sure that fancy pointers work
 
@@ -132,10 +133,14 @@ void test() {
     assert(orig.size() == 3);
     assert(orig.get_allocator() == other_allocator<V>(10));
   }
+  return true;
 }
 
 int main(int, char**) {
-  test();
+  assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
 
   return 0;
 }