Tests: WIP retry CI

Author: H-G-Hristov

libcxx/include/spanstream

@@ -66,7 +66,7 @@
 #include <__utility/move.h>
 #include <__utility/swap.h>
 #include <iostream>
-#include <print>
+// #include <print>
 #include <span>
 #include <streambuf>
 #include <version>
@@ -267,14 +267,14 @@ public:
     requires(!convertible_to<_ROSeq, std::span<_CharT>>) && convertible_to<_ROSeq, std::span<const _CharT>>
   _LIBCPP_HIDE_FROM_ABI explicit basic_ispanstream(_ROSeq&& __s)
       : basic_istream<_CharT, _Traits>(std::addressof(__sb_)) {
-    std::println(stderr, "ispanstream");
+    // std::println(stderr, "ispanstream");
     std::span<const _CharT> __sp(std::forward<_ROSeq>(__s));
-    std::println(stderr, "span __sb_ {} {}", __sb_.span().empty(), __sb_.span().size());
-    std::println(stderr, "span data {} {}", __sp.empty(), __sp.size());
-    std::println(stderr, "ispanstream 2");
+    // std::println(stderr, "span __sb_ {} {}", __sb_.span().empty(), __sb_.span().size());
+    // std::println(stderr, "span data {} {}", __sp.empty(), __sp.size());
+    // std::println(stderr, "ispanstream 2");
     this->span(std::span<_CharT>(std::span<_CharT>(const_cast<_CharT*>(__sp.data()), __sp.size())));
-    std::println(stderr, "span __sb_ {} {}", __sb_.span().empty(), __sb_.span().size());
-    std::println(stderr, "ispanstream 3");
+    // std::println(stderr, "span __sb_ {} {}", __sb_.span().empty(), __sb_.span().size());
+    // std::println(stderr, "ispanstream 3");
   }
 
   basic_ispanstream& operator=(const basic_ispanstream&) = delete;

libcxx/test/std/input.output/span.streams/helper_types.h

@@ -16,7 +16,7 @@
 
 #include "test_macros.h"
 
-#include <print>
+// #include <print>
 
 template <typename CharT, std::size_t N = 0>
 class ReadOnlySpan {
@@ -26,16 +26,16 @@ class ReadOnlySpan {
   operator std::span<CharT>() = delete;
 
   operator std::span<const CharT>() {
-    std::println(stderr, "----> ROspan");
+    // std::println(stderr, "----> ROspan");
     return std::span<const CharT, N>{arr_};
   }
 
   const CharT* begin() {
-    std::println(stderr, "----> ROspan begin");
+    // std::println(stderr, "----> ROspan begin");
     return arr_;
   }
   const CharT* end() {
-    std::println(stderr, "----> ROspan end");
+    // std::println(stderr, "----> ROspan end");
     return arr_ + N;
   }
 
@@ -126,109 +126,6 @@ static_assert(!std::constructible_from<std::span<const wchar_t>, const NonReadOn
 static_assert(!std::convertible_to<const NonReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
 #endif
 
-template <typename CharT, std::size_t N = 0>
-class ConstConvertibleReadOnlySpan {
-  explicit ConstConvertibleReadOnlySpan(CharT (&arr)[N]) : arr_{arr} {}
-
-public:
-  operator std::span<CharT>()       = delete;
-  operator std::span<CharT>() const = delete;
-
-  operator std::span<const CharT>() = delete;
-  operator std::span<const CharT>() const { return std::span<const CharT, N>{arr_}; }
-
-  const CharT* begin() { return arr_; }
-  const CharT* end() { return arr_ + N; }
-
-private:
-  CharT* arr_;
-};
-
-template <typename CharT, std::size_t N>
-inline constexpr bool std::ranges::enable_borrowed_range<ConstConvertibleReadOnlySpan<CharT, N>> = true;
-
-static_assert(std::ranges::borrowed_range<ConstConvertibleReadOnlySpan<char>>);
-
-static_assert(!std::constructible_from<std::span<char>, ConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<ConstConvertibleReadOnlySpan<char>, std::span<char>>);
-
-static_assert(!std::constructible_from<std::span<char>, const ConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<const ConstConvertibleReadOnlySpan<char>, std::span<char>>);
-
-static_assert(std::constructible_from<std::span<const char>, ConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<ConstConvertibleReadOnlySpan<char>, std::span<const char>>);
-
-static_assert(std::constructible_from<std::span<const char>, const ConstConvertibleReadOnlySpan<char>>);
-static_assert(std::convertible_to<const ConstConvertibleReadOnlySpan<char>, std::span<const char>>);
-
-#ifndef TEST_HAS_NO_WIDE_CHARACTERS
-
-static_assert(std::ranges::borrowed_range<ConstConvertibleReadOnlySpan<wchar_t>>);
-
-static_assert(!std::constructible_from<std::span<wchar_t>, ConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<ConstConvertibleReadOnlySpan<wchar_t>, std::span<wchar_t>>);
-
-static_assert(!std::constructible_from<std::span<wchar_t>, const ConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<const ConstConvertibleReadOnlySpan<wchar_t>, std::span<wchar_t>>);
-
-static_assert(std::constructible_from<std::span<const wchar_t>, ConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<ConstConvertibleReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
-
-static_assert(std::constructible_from<std::span<const wchar_t>, const ConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(std::convertible_to<const ConstConvertibleReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
-#endif
-
-template <typename CharT, std::size_t N = 0>
-class NonConstConvertibleReadOnlySpan {
-  explicit NonConstConvertibleReadOnlySpan(CharT (&arr)[N]) : arr_{arr} {}
-
-public:
-  operator std::span<CharT>()       = delete;
-  operator std::span<CharT>() const = delete;
-
-  operator std::span<const CharT>() { return std::span<const CharT, N>{arr_}; }
-  operator std::span<const CharT>() const = delete;
-
-  const CharT* begin() { return arr_; }
-  const CharT* end() { return arr_ + N; }
-
-private:
-  CharT* arr_;
-};
-
-template <typename CharT, std::size_t N>
-inline constexpr bool std::ranges::enable_borrowed_range<NonConstConvertibleReadOnlySpan<CharT, N>> = true;
-
-static_assert(std::ranges::borrowed_range<NonConstConvertibleReadOnlySpan<char>>);
-
-static_assert(!std::constructible_from<std::span<char>, NonConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<NonConstConvertibleReadOnlySpan<char>, std::span<char>>);
-
-static_assert(!std::constructible_from<std::span<char>, const NonConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<const NonConstConvertibleReadOnlySpan<char>, std::span<char>>);
-
-static_assert(std::constructible_from<std::span<const char>, NonConstConvertibleReadOnlySpan<char>>);
-static_assert(std::convertible_to<NonConstConvertibleReadOnlySpan<char>, std::span<const char>>);
-
-static_assert(!std::constructible_from<std::span<const char>, const NonConstConvertibleReadOnlySpan<char>>);
-static_assert(!std::convertible_to<const NonConstConvertibleReadOnlySpan<char>, std::span<const char>>);
-
-#ifndef TEST_HAS_NO_WIDE_CHARACTERS
-static_assert(std::ranges::borrowed_range<NonConstConvertibleReadOnlySpan<wchar_t>>);
-
-static_assert(!std::constructible_from<std::span<wchar_t>, NonConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<NonConstConvertibleReadOnlySpan<wchar_t>, std::span<wchar_t>>);
-
-static_assert(!std::constructible_from<std::span<wchar_t>, const NonConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<const NonConstConvertibleReadOnlySpan<wchar_t>, std::span<wchar_t>>);
-
-static_assert(std::constructible_from<std::span<const wchar_t>, NonConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(std::convertible_to<NonConstConvertibleReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
-
-static_assert(!std::constructible_from<std::span<const wchar_t>, const NonConstConvertibleReadOnlySpan<wchar_t>>);
-static_assert(!std::convertible_to<const NonConstConvertibleReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
-#endif
-
 struct SomeObject {};
 
 struct NonMode {};

libcxx/test/std/input.output/span.streams/ispanstream/ispanstream.cons/ros.pass.cpp

@@ -29,28 +29,6 @@
 
 #include "../../helper_types.h"
 
-#ifndef TEST_HAS_NO_NASTY_STRING
-void test_sfinae_with_nasty_char() {
-  using SpStream = std::basic_ispanstream<nasty_char, nasty_char_traits>;
-
-  // Non-const convertible
-  static_assert(std::constructible_from<SpStream, ReadOnlySpan<nasty_char>>);
-  static_assert(!test_convertible<SpStream, ReadOnlySpan<nasty_char>>());
-
-  // Const convertible
-  static_assert(!std::constructible_from<SpStream, const ReadOnlySpan<nasty_char>>);
-  static_assert(!test_convertible<SpStream, const ReadOnlySpan<nasty_char>>());
-
-  // Non-const non-convertible
-  static_assert(std::constructible_from<SpStream, ReadOnlySpan<nasty_char>>);
-  static_assert(!test_convertible<SpStream, ReadOnlySpan<nasty_char>>());
-
-  // Const non-convertible
-  static_assert(!std::constructible_from<SpStream, const ReadOnlySpan<nasty_char>>);
-  static_assert(!test_convertible<SpStream, const ReadOnlySpan<nasty_char>>());
-}
-#endif // TEST_HAS_NO_NASTY_STRING
-
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
   using SpStream =
@@ -95,7 +73,7 @@ void test() {
 
   {
     SpStream spSt(ros2);
-    assert(spSt.span().data() == arr);
+    assert(spSt.span().data() != arr);
     assert(spSt.span().data() == arr1);
     assert(spSt.span().empty());
     assert(spSt.span().size() == 0);
@@ -104,8 +82,7 @@ void test() {
 
 int main(int, char**) {
 #ifndef TEST_HAS_NO_NASTY_STRING
-  // test_sfinae<nasty_char, nasty_char_traits>();
-  test_sfinae_with_nasty_char();
+  test_sfinae<nasty_char, nasty_char_traits>();
 #endif
   test_sfinae<char>();
   test_sfinae<char, constexpr_char_traits<char>>();