Clean up tests + fix gcc failure

Author: smallp-o-p

libcxx/test/std/utilities/text_encoding/test_text_encoding.h

@@ -9,29 +9,13 @@
 #ifndef SUPPORT_TEST_TEXT_ENCODING_H
 #define SUPPORT_TEST_TEXT_ENCODING_H
 
-#include <algorithm>
-#include <cassert>
-#include <clocale>
-#include <concepts>
-#include <cstdio>
-#include <cstdlib>
-#include <iostream>
-#include <print>
-#include <ranges>
-#include <string_view>
-#include <text_encoding>
-#include <type_traits>
-
-#include "platform_support.h"
-#include "test_macros.h"
-
 struct encoding_data {
   const char* name;
   int mib;
   int size;
 };
 
-constexpr const encoding_data unique_encoding_data[]{
+constexpr encoding_data unique_encoding_data[]{
     {"US-ASCII", 3, 8},
     {"ISO_8859-1:1987", 4, 15},
     {"ISO_8859-2:1987", 5, 15},

libcxx/test/std/utilities/text_encoding/text_encoding.ctor/id.pass.cpp

@@ -14,13 +14,11 @@
 
 // text_encoding::text_encoding(id) noexcept
 
-// Concerns:
-// 1. text_encoding(id) must be nothrow
-// 2. Constructing an object with a valid id must set mib() and the name to the corresponding value.
-// 3. Constructing an object using id::unknown must set mib() to id::unknown and the name to an empty string.
-// 4. Constructing an object using id::other must set mib() to id::other and the name to an empty string.
-
+#include <algorithm>
 #include <cassert>
+#include <ranges>
+#include <text_encoding>
+#include <type_traits>
 
 #include "../test_text_encoding.h"
 
@@ -79,21 +77,25 @@ constexpr bool test_other() {
 
 int main(int, char**) {
   {
+    // 1. text_encoding(id) must be nothrow
     static_assert(std::is_nothrow_constructible<std::text_encoding, std::text_encoding::id>::value,
                   "Must be nothrow constructible with id");
   }
 
   {
+    // 2. Constructing an object with a valid id must set mib() and the name to the corresponding value.
     static_assert(id_ctors());
     assert(id_ctors());
   }
 
   {
+    // 3. Constructing an object using id::unknown must set mib() to id::unknown and the name to an empty string.
     static_assert(test_unknown());
     assert(test_unknown());
   }
 
   {
+    // 4. Constructing an object using id::other must set mib() to id::other and the name to an empty string.
     static_assert(test_other());
     assert(test_other());
   }

libcxx/test/std/utilities/text_encoding/text_encoding.ctor/string_view.pass.cpp

@@ -10,13 +10,15 @@
 
 // REQUIRES: std-at-least-c++26
 // ADDITIONAL_COMPILE_FLAGS(has-fconstexpr-steps): -fconstexpr-steps=20000000
-// ADDITIONAL_COMPILE_FLAGS(has-fconstexpr-ops-limit): -fconstexpr-ops-limit=80000000
-
+// ADDITIONAL_COMPILE_FLAGS(has-fconstexpr-ops-limit): -fconstexpr-ops-limit=90000000
 // class text_encoding
 
 // text_encoding::text_encoding(string_view) noexcept
 
 #include <cassert>
+#include <string_view>
+#include <text_encoding>
+#include <type_traits>
 
 #include "../test_text_encoding.h"
 
@@ -25,21 +27,27 @@ constexpr bool test_ctor(std::string_view str, std::string_view expect, std::tex
   bool success = true;
 
   assert(te.mib() == expect_id);
-  assert(expect.compare(te.name()) == 0);
+  assert(te.name() == expect);
 
   return success;
 }
 
 constexpr bool test_primary_encoding_spellings() {
-  for (auto& pair : unique_encoding_data) {
-    assert(test_ctor(pair.name, pair.name, std::text_encoding::id{pair.mib}));
+  for (auto& data : unique_encoding_data) {
+    auto te = std::text_encoding(std::string_view(data.name));
+
+    assert(te.mib() == std::text_encoding::id(data.mib));
+    assert(te.name() == std::string_view(data.name));
   }
   return true;
 }
 
 constexpr bool test_others() {
   for (auto& name : other_names) {
-    assert(test_ctor(name, name, std::text_encoding::other));
+    auto te = std::text_encoding(std::string_view(name));
+
+    assert(te.mib() == std::text_encoding::other);
+    assert(te.name() == std::string_view(name));
   }
   return true;
 }

libcxx/test/std/utilities/text_encoding/text_encoding.eq/equal.id.pass.cpp

@@ -15,7 +15,9 @@
 // text_encoding operator==(const text_encoding&, id) _NOEXCEPT
 
 #include <cassert>
+#include <text_encoding>
 
+#include "test_macros.h"
 #include "../test_text_encoding.h"
 
 using id = std::text_encoding::id;

libcxx/test/std/utilities/text_encoding/text_encoding.members/environment.nodiscard.verify.cpp

@@ -10,10 +10,9 @@
 
 // REQUIRES: std-at-least-c++26
 // UNSUPPORTED: no-localization
+// UNSUPPORTED: android
 
 // class text_encoding
-// UNSUPPORTED: no-localization
-// UNSUPPORTED: android
 
 // Concerns:
 // 1. Verify that text_encoding member functions are nodiscard

libcxx/test/std/utilities/text_encoding/text_encoding.members/text_encoding.aliases_view/empty.pass.cpp

@@ -14,6 +14,7 @@
 // struct text_encoding::aliases_view
 
 #include <cassert>
+#include <ranges>
 #include <text_encoding>
 
 #include "../../test_text_encoding.h"