diff mbox series

[committed,1/2] libstdc++: Rearrange tests for <bitset>

Message ID 20220922142353.1139862-1-jwakely@redhat.com
State Committed
Commit 569ebd6bdd45cb5f90634c93e9623d96928b4fce
Headers
Series [committed,1/2] libstdc++: Rearrange tests for <bitset> |

Commit Message

Jonathan Wakely Sept. 22, 2022, 2:23 p.m. UTC 
  Tested x86_64-linux. Pushed to trunk.

-- >8 --

In C++03 std::bitset was in the Container clause, but since C++11 it has
been in the Utilties clause. This moves the tests to the 20_util
directory, where most people probably expect to find them.

Also create 'access', 'observers', and 'io' subdirectories and group
some tests under there, rather than having one directory per function
name, and only a single test in that directory.

libstdc++-v3/ChangeLog:

	* testsuite/23_containers/bitset/18604.cc: Moved to...
	* testsuite/20_util/bitset/18604.cc: ...here.
	* testsuite/23_containers/bitset/45713.cc: Moved to...
	* testsuite/20_util/bitset/45713.cc: ...here.
	* testsuite/23_containers/bitset/to_string/dr396.cc: Moved to...
	* testsuite/20_util/bitset/access/dr396.cc: ...here.
	* testsuite/23_containers/bitset/to_string/1.cc: Moved to...
	* testsuite/20_util/bitset/access/to_string.cc: ...here.
	* testsuite/23_containers/bitset/to_ullong/1.cc: Moved to...
	* testsuite/20_util/bitset/access/to_ullong.cc: ...here.
	* testsuite/23_containers/bitset/to_ulong/1.cc: Moved to...
	* testsuite/20_util/bitset/access/to_ulong.cc: ...here.
	* testsuite/23_containers/bitset/cons/1.cc: Moved to...
	* testsuite/20_util/bitset/cons/1.cc: ...here.
	* testsuite/23_containers/bitset/cons/16020.cc: Moved to...
	* testsuite/20_util/bitset/cons/16020.cc: ...here.
	* testsuite/23_containers/bitset/cons/2.cc: Moved to...
	* testsuite/20_util/bitset/cons/2.cc: ...here.
	* testsuite/23_containers/bitset/cons/3.cc: Moved to...
	* testsuite/20_util/bitset/cons/3.cc: ...here.
	* testsuite/23_containers/bitset/cons/38244.cc: Moved to...
	* testsuite/20_util/bitset/cons/38244.cc: ...here.
	* testsuite/23_containers/bitset/cons/50268.cc: Moved to...
	* testsuite/20_util/bitset/cons/50268.cc: ...here.
	* testsuite/23_containers/bitset/cons/6282.cc: Moved to...
	* testsuite/20_util/bitset/cons/6282.cc: ...here.
	* testsuite/23_containers/bitset/cons/constexpr.cc: Moved to...
	* testsuite/20_util/bitset/cons/constexpr.cc: ...here.
	* testsuite/23_containers/bitset/cons/dr1325-1.cc: Moved to...
	* testsuite/20_util/bitset/cons/dr1325-1.cc: ...here.
	* testsuite/23_containers/bitset/cons/dr1325-2.cc: Moved to...
	* testsuite/20_util/bitset/cons/dr1325-2.cc: ...here.
	* testsuite/23_containers/bitset/cons/dr396.cc: Moved to...
	* testsuite/20_util/bitset/cons/dr396.cc: ...here.
	* testsuite/23_containers/bitset/debug/invalidation/1.cc: Moved to...
	* testsuite/20_util/bitset/debug/invalidation/1.cc: ...here.
	* testsuite/23_containers/bitset/ext/15361.cc: Moved to...
	* testsuite/20_util/bitset/ext/15361.cc: ...here.
	* testsuite/23_containers/bitset/hash/1.cc: Moved to...
	* testsuite/20_util/bitset/hash/1.cc: ...here.
	* testsuite/23_containers/bitset/input/1.cc: Moved to...
	* testsuite/20_util/bitset/io/input.cc: ...here.
	* testsuite/23_containers/bitset/count/6124.cc: Moved to...
	* testsuite/20_util/bitset/observers/6124.cc: ...here.
	* testsuite/23_containers/bitset/all/1.cc: Moved to...
	* testsuite/20_util/bitset/observers/all.cc: ...here.
	* testsuite/23_containers/bitset/test/1.cc: Moved to...
	* testsuite/20_util/bitset/observers/test.cc: ...here.
	* testsuite/23_containers/bitset/operations/1.cc: Moved to...
	* testsuite/20_util/bitset/operations/1.cc: ...here.
	* testsuite/23_containers/bitset/operations/13838.cc: Moved to...
	* testsuite/20_util/bitset/operations/13838.cc: ...here.
	* testsuite/23_containers/bitset/operations/2.cc: Moved to...
	* testsuite/20_util/bitset/operations/2.cc: ...here.
	* testsuite/23_containers/bitset/operations/96303.cc: Moved to...
	* testsuite/20_util/bitset/operations/96303.cc: ...here.
	* testsuite/23_containers/bitset/operations/constexpr-2.cc: Moved to...
	* testsuite/20_util/bitset/operations/constexpr-2.cc: ...here.
	* testsuite/23_containers/bitset/operations/constexpr.cc: Moved to...
	* testsuite/20_util/bitset/operations/constexpr.cc: ...here.
	* testsuite/23_containers/bitset/requirements/constexpr_functions.cc: Moved to...
	* testsuite/20_util/bitset/requirements/constexpr_functions.cc: ...here.
	* testsuite/23_containers/bitset/requirements/explicit_instantiation/1.cc: Moved to...
	* testsuite/20_util/bitset/requirements/explicit_instantiation/1.cc: ...here.
	* testsuite/23_containers/bitset/requirements/explicit_instantiation/1_c++0x.cc: Moved to...
	* testsuite/20_util/bitset/requirements/explicit_instantiation/1_c++0x.cc: ...here.
	* testsuite/23_containers/headers/bitset/synopsis.cc: Moved to...
	* testsuite/20_util/headers/bitset/synopsis.cc: ...here.
---
 libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/18604.cc | 0
 libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/45713.cc | 0
 .../bitset/to_string => 20_util/bitset/access}/dr396.cc           | 0
 .../bitset/to_string/1.cc => 20_util/bitset/access/to_string.cc}  | 0
 .../bitset/to_ullong/1.cc => 20_util/bitset/access/to_ullong.cc}  | 0
 .../bitset/to_ulong/1.cc => 20_util/bitset/access/to_ulong.cc}    | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/1.cc         | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/16020.cc     | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/2.cc         | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/3.cc         | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/38244.cc     | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/50268.cc     | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/6282.cc      | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/constexpr.cc | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/dr1325-1.cc  | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/dr1325-2.cc  | 0
 .../testsuite/{23_containers => 20_util}/bitset/cons/dr396.cc     | 0
 .../{23_containers => 20_util}/bitset/debug/invalidation/1.cc     | 0
 .../testsuite/{23_containers => 20_util}/bitset/ext/15361.cc      | 0
 .../testsuite/{23_containers => 20_util}/bitset/hash/1.cc         | 0
 .../bitset/input/1.cc => 20_util/bitset/io/input.cc}              | 0
 .../bitset/count => 20_util/bitset/observers}/6124.cc             | 0
 .../bitset/all/1.cc => 20_util/bitset/observers/all.cc}           | 0
 .../bitset/test/1.cc => 20_util/bitset/observers/test.cc}         | 0
 .../testsuite/{23_containers => 20_util}/bitset/operations/1.cc   | 0
 .../{23_containers => 20_util}/bitset/operations/13838.cc         | 0
 .../testsuite/{23_containers => 20_util}/bitset/operations/2.cc   | 0
 .../{23_containers => 20_util}/bitset/operations/96303.cc         | 0
 .../{23_containers => 20_util}/bitset/operations/constexpr-2.cc   | 0
 .../{23_containers => 20_util}/bitset/operations/constexpr.cc     | 0
 .../bitset/requirements/constexpr_functions.cc                    | 0
 .../bitset/requirements/explicit_instantiation/1.cc               | 0
 .../bitset/requirements/explicit_instantiation/1_c++0x.cc         | 0
 .../{23_containers => 20_util}/headers/bitset/synopsis.cc         | 0
 34 files changed, 0 insertions(+), 0 deletions(-)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/18604.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/45713.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/to_string => 20_util/bitset/access}/dr396.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/to_string/1.cc => 20_util/bitset/access/to_string.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/to_ullong/1.cc => 20_util/bitset/access/to_ullong.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/to_ulong/1.cc => 20_util/bitset/access/to_ulong.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/16020.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/2.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/3.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/38244.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/50268.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/6282.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/constexpr.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/dr1325-1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/dr1325-2.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/cons/dr396.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/debug/invalidation/1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/ext/15361.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/hash/1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/input/1.cc => 20_util/bitset/io/input.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/count => 20_util/bitset/observers}/6124.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/all/1.cc => 20_util/bitset/observers/all.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers/bitset/test/1.cc => 20_util/bitset/observers/test.cc} (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/13838.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/2.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/96303.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/constexpr-2.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/operations/constexpr.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/requirements/constexpr_functions.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/requirements/explicit_instantiation/1.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/bitset/requirements/explicit_instantiation/1_c++0x.cc (100%)
 rename libstdc++-v3/testsuite/{23_containers => 20_util}/headers/bitset/synopsis.cc (100%)
diff mbox series

Patch

diff --git a/libstdc++-v3/testsuite/23_containers/bitset/18604.cc b/libstdc++-v3/testsuite/20_util/bitset/18604.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/18604.cc
rename to libstdc++-v3/testsuite/20_util/bitset/18604.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/45713.cc b/libstdc++-v3/testsuite/20_util/bitset/45713.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/45713.cc
rename to libstdc++-v3/testsuite/20_util/bitset/45713.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc b/libstdc++-v3/testsuite/20_util/bitset/access/dr396.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/dr396.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_string.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_string.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_ullong.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_ullong.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_ulong.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_ulong.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/16020.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/16020.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/3.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/38244.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/38244.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/38244.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/38244.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/50268.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/50268.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/6282.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/6282.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/constexpr.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/constexpr.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-1.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr396.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr396.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/debug/invalidation/1.cc b/libstdc++-v3/testsuite/20_util/bitset/debug/invalidation/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/debug/invalidation/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/debug/invalidation/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc b/libstdc++-v3/testsuite/20_util/bitset/ext/15361.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc
rename to libstdc++-v3/testsuite/20_util/bitset/ext/15361.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc b/libstdc++-v3/testsuite/20_util/bitset/hash/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/hash/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc b/libstdc++-v3/testsuite/20_util/bitset/io/input.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/input/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/io/input.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/count/6124.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/6124.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/count/6124.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/6124.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/all.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/all/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/all.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/test.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/test/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/test.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/13838.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/13838.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/96303.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/96303.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/96303.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/96303.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr-2.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr-2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr-2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/constexpr-2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/constexpr.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/constexpr_functions.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/constexpr_functions.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/constexpr_functions.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/constexpr_functions.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1_c++0x.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1_c++0x.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1_c++0x.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1_c++0x.cc
diff --git a/libstdc++-v3/testsuite/23_containers/headers/bitset/synopsis.cc b/libstdc++-v3/testsuite/20_util/headers/bitset/synopsis.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/headers/bitset/synopsis.cc
rename to libstdc++-v3/testsuite/20_util/headers/bitset/synopsis.cc