[committed] libstdc++: Fix test FAIL for old std::string ABI
Jonathan Wakely
jwakely@redhat.com
Tue Oct 4 16:46:37 GMT 2022
Tested powerpc64le-linux. Pushed to trunk.
-- >8 --
libstdc++-v3/ChangeLog:
* testsuite/std/ranges/adaptors/join_with/1.cc: Remove unused
<sstream header.
(test04): Remove constexpr for old std::string ABI and test at
runtime.
---
.../testsuite/std/ranges/adaptors/join_with/1.cc | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
index efa350feb11..8b9c6c4fc9f 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
@@ -3,8 +3,7 @@
#include <ranges>
#include <algorithm>
-#include <sstream>
-#include <string_view>
+#include <string>
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
@@ -73,7 +72,10 @@ test03()
return true;
}
-constexpr bool
+#if _GLIBCXX_USE_CXX11_ABI
+constexpr
+#endif
+bool
test04()
{
std::string rs[] = {"a", "", "b", "", "c"};
@@ -93,5 +95,9 @@ main()
static_assert(test01());
static_assert(test02());
static_assert(test03());
+#if _GLIBCXX_USE_CXX11_ABI
static_assert(test04());
+#else
+ VERIFY(test04());
+#endif
}
--
2.37.3
More information about the Libstdc++
mailing list