From 6eb60ced21ebca771bf085b3cc339569f3ccb106 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 20 May 2022 10:41:53 +0100
Subject: [PATCH] libstdc++: Rename tests like .../wchar_t/1.cc to
 .../wchar_t.cc

There's no need to have directories containing a single test file, we
can rename the files to the directory names and remove the directories.

The dejagnu proc that filters out wchar_t tests just checks for
"wchar_t" anywhere in the path, so will work just as well on wchar_t.cc
or constexpr-wchar_t.cc paths.

libstdc++-v3/ChangeLog:

	* testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/modifiers/pop_back/char.cc:
	...here.
	* testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/modifiers/swap/wchar_t/constexpr.cc:
	Moved to...
	* testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/modifiers/swap/char/constexpr.cc:
	Moved to...
	* testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/contains/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/contains/char.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/contains/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/contains/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/data/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/data/char.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/data/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/ends_with/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/ends_with/char.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/ends_with/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/starts_with/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/starts_with/char.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/starts_with/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/substr/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/substr/char.cc:
	...here.
	* testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/operations/substr/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/range_access/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/range_access/char.cc:
	...here.
	* testsuite/21_strings/basic_string/range_access/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/range_access/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/swap/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/swap/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/contains/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/contains/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/contains/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/data/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/data/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/data/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/ends_with/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/ends_with/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/starts_with/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/starts_with/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/substr/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/substr/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/operations/substr/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/range_access/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/range_access/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/range_access/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/range_access/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/int.cc:
	...here.
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/int.cc:
	...here.
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/short/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/short.cc:
	...here.
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t/1.cc:
	Moved to...
	* testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t.cc:
	...here.
---
 .../basic_string/modifiers/pop_back/{char/1.cc => char.cc}        | 0
 .../basic_string/modifiers/pop_back/{wchar_t/1.cc => wchar_t.cc}  | 0
 .../modifiers/swap/{wchar_t/constexpr.cc => constexpr-wchar_t.cc} | 0
 .../basic_string/modifiers/swap/{char => }/constexpr.cc           | 0
 .../basic_string/operations/contains/{char/1.cc => char.cc}       | 0
 .../basic_string/operations/contains/{wchar_t/1.cc => wchar_t.cc} | 0
 .../basic_string/operations/data/{char/1.cc => char.cc}           | 0
 .../basic_string/operations/data/{wchar_t/1.cc => wchar_t.cc}     | 0
 .../basic_string/operations/ends_with/{char/1.cc => char.cc}      | 0
 .../operations/ends_with/{wchar_t/1.cc => wchar_t.cc}             | 0
 .../basic_string/operations/starts_with/{char/1.cc => char.cc}    | 0
 .../operations/starts_with/{wchar_t/1.cc => wchar_t.cc}           | 0
 .../basic_string/operations/substr/{char/1.cc => char.cc}         | 0
 .../basic_string/operations/substr/{wchar_t/1.cc => wchar_t.cc}   | 0
 .../21_strings/basic_string/range_access/{char/1.cc => char.cc}   | 0
 .../basic_string/range_access/{wchar_t/1.cc => wchar_t.cc}        | 0
 .../requirements/explicit_instantiation/{char/1.cc => char.cc}    | 0
 .../explicit_instantiation/{char16_t/1.cc => char16_t.cc}         | 0
 .../explicit_instantiation/{char32_t/1.cc => char32_t.cc}         | 0
 .../explicit_instantiation/{char8_t/1.cc => char8_t.cc}           | 0
 .../requirements/explicit_instantiation/{1.cc => int.cc}          | 0
 .../explicit_instantiation/{wchar_t/1.cc => wchar_t.cc}           | 0
 .../modifiers/remove_prefix/{char/1.cc => char.cc}                | 0
 .../modifiers/remove_prefix/{wchar_t/1.cc => wchar_t.cc}          | 0
 .../modifiers/remove_suffix/{char/1.cc => char.cc}                | 0
 .../modifiers/remove_suffix/{wchar_t/1.cc => wchar_t.cc}          | 0
 .../basic_string_view/modifiers/swap/{char/1.cc => char.cc}       | 0
 .../basic_string_view/modifiers/swap/{wchar_t/1.cc => wchar_t.cc} | 0
 .../basic_string_view/operations/contains/{char/1.cc => char.cc}  | 0
 .../operations/contains/{wchar_t/1.cc => wchar_t.cc}              | 0
 .../basic_string_view/operations/data/{char/1.cc => char.cc}      | 0
 .../operations/data/{wchar_t/1.cc => wchar_t.cc}                  | 0
 .../basic_string_view/operations/ends_with/{char/1.cc => char.cc} | 0
 .../operations/ends_with/{wchar_t/1.cc => wchar_t.cc}             | 0
 .../operations/starts_with/{char/1.cc => char.cc}                 | 0
 .../operations/starts_with/{wchar_t/1.cc => wchar_t.cc}           | 0
 .../basic_string_view/operations/substr/{char/1.cc => char.cc}    | 0
 .../operations/substr/{wchar_t/1.cc => wchar_t.cc}                | 0
 .../basic_string_view/range_access/{char/1.cc => char.cc}         | 0
 .../basic_string_view/range_access/{wchar_t/1.cc => wchar_t.cc}   | 0
 .../requirements/explicit_instantiation/{char/1.cc => char.cc}    | 0
 .../explicit_instantiation/{char16_t/1.cc => char16_t.cc}         | 0
 .../explicit_instantiation/{char32_t/1.cc => char32_t.cc}         | 0
 .../explicit_instantiation/{char8_t/1.cc => char8_t.cc}           | 0
 .../requirements/explicit_instantiation/{1.cc => int.cc}          | 0
 .../explicit_instantiation/{wchar_t/1.cc => wchar_t.cc}           | 0
 .../requirements/explicit_instantiation/{char/1.cc => char.cc}    | 0
 .../explicit_instantiation/{char16_t/1.cc => char16_t.cc}         | 0
 .../explicit_instantiation/{char32_t/1.cc => char32_t.cc}         | 0
 .../explicit_instantiation/{char8_t/1.cc => char8_t.cc}           | 0
 .../requirements/explicit_instantiation/{short/1.cc => short.cc}  | 0
 .../explicit_instantiation/{wchar_t/1.cc => wchar_t.cc}           | 0
 52 files changed, 0 insertions(+), 0 deletions(-)
 rename libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/{wchar_t/constexpr.cc => constexpr-wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/{char => }/constexpr.cc (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/data/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/data/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/range_access/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/range_access/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{char16_t/1.cc => char16_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{char32_t/1.cc => char32_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{char8_t/1.cc => char8_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{1.cc => int.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{char16_t/1.cc => char16_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{char32_t/1.cc => char32_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{char8_t/1.cc => char8_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{1.cc => int.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/{wchar_t/1.cc => wchar_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{char/1.cc => char.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{char16_t/1.cc => char16_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{char32_t/1.cc => char32_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{char8_t/1.cc => char8_t.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{short/1.cc => short.cc} (100%)
 rename libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/{wchar_t/1.cc => wchar_t.cc} (100%)

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/wchar_t/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/wchar_t/constexpr.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/char/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/char/constexpr.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/range_access/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/range_access/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/range_access/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/range_access/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/range_access/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/range_access/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/range_access/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/range_access/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char16_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char32_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/char8_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/int.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/int.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/swap/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/range_access/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char16_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char32_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/char8_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/int.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/int.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/explicit_instantiation/wchar_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char16_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char32_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char8_t.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/short/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/short.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/short/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/short.cc
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t.cc