Cleanup: Add TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED for consistency.

Author: StephanTLavavej

libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp

@@ -38,7 +38,7 @@ struct Test {
 TEST_CONSTEXPR_CXX20 bool test() {
   types::for_each(types::cpp17_input_iterator_list<const int*>(), Test());
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     std::vector<bool> vec(256 + 64);
     for (ptrdiff_t i = 0; i != 256; ++i) {
       for (size_t offset = 0; offset != 64; ++offset) {

libcxx/test/std/strings/string.view/string.view.comparison/equal.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) == v[j]) == expected);
       assert((v[i] == ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) == v[j]) == expected);
         assert((v[i] == std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() == abc0def) == false);
   assert((abc0def == abc.data()) == false);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) == abc0def) == false);
     assert((abc0def == std::basic_string<CharT, Traits>(abc)) == false);
   }

libcxx/test/std/strings/string.view/string.view.comparison/greater.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) > v[j]) == expected);
       assert((v[i] > ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) > v[j]) == expected);
         assert((v[i] > std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() > abc0def) == false);
   assert((abc0def > abc.data()) == true);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) > abc0def) == false);
     assert((abc0def > std::basic_string<CharT, Traits>(abc)) == true);
   }

libcxx/test/std/strings/string.view/string.view.comparison/greater_equal.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) >= v[j]) == expected);
       assert((v[i] >= ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) >= v[j]) == expected);
         assert((v[i] >= std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() >= abc0def) == false);
   assert((abc0def >= abc.data()) == true);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) >= abc0def) == false);
     assert((abc0def >= std::basic_string<CharT, Traits>(abc)) == true);
   }

libcxx/test/std/strings/string.view/string.view.comparison/less.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) < v[j]) == expected);
       assert((v[i] < ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) < v[j]) == expected);
         assert((v[i] < std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() < abc0def) == true);
   assert((abc0def < abc.data()) == false);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) < abc0def) == true);
     assert((abc0def < std::basic_string<CharT, Traits>(abc)) == false);
   }

libcxx/test/std/strings/string.view/string.view.comparison/less_equal.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) <= v[j]) == expected);
       assert((v[i] <= ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) <= v[j]) == expected);
         assert((v[i] <= std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() <= abc0def) == true);
   assert((abc0def <= abc.data()) == false);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) <= abc0def) == true);
     assert((abc0def <= std::basic_string<CharT, Traits>(abc)) == false);
   }

libcxx/test/std/strings/string.view/string.view.comparison/not_equal.pass.cpp

@@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
       assert((ConvertibleTo<SV>(v[i]) != v[j]) == expected);
       assert((v[i] != ConvertibleTo<SV>(v[j])) == expected);
 
-      if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+      if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
         assert((std::basic_string<CharT, Traits>(v[i]) != v[j]) == expected);
         assert((v[i] != std::basic_string<CharT, Traits>(v[j])) == expected);
       }
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
   assert((abc.data() != abc0def) == true);
   assert((abc0def != abc.data()) == true);
 
-  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
+  if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
     assert((std::basic_string<CharT, Traits>(abc) != abc0def) == true);
     assert((abc0def != std::basic_string<CharT, Traits>(abc)) == true);
   }

libcxx/test/support/test_macros.h

@@ -157,6 +157,12 @@
 #  define TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED (!TEST_IS_CONSTANT_EVALUATED)
 #endif
 
+#if TEST_STD_VER >= 20
+#  define TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED true
+#else
+#  define TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED (!TEST_IS_CONSTANT_EVALUATED)
+#endif
+
 #if TEST_STD_VER >= 14
 # define TEST_CONSTEXPR_CXX14 constexpr
 #else