From patchwork Thu Sep 22 14:23:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1371 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp224950wrt; Thu, 22 Sep 2022 07:25:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4C7CI2M3HsGxP77uNqBa8NvLOGNzWhyaajZ/pFuFAEz2/YhaAsutivTymW2qL20UREKf8+ X-Received: by 2002:a17:906:6dd3:b0:742:296d:15c8 with SMTP id j19-20020a1709066dd300b00742296d15c8mr3024074ejt.550.1663856709847; Thu, 22 Sep 2022 07:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663856709; cv=none; d=google.com; s=arc-20160816; b=y7Cz8oiym2Rxf9prNpwEz0p6DLgc5LYwJHkKZvrVomfz1bKpCyIBjnNpF1wsicy/4g YSyG0YeCiM9lB+nIwKx4NvoAqi2m32OTDA43YOyKp7sY7NzA7p/0hv7CWPmdf5Lr9pks 3zcxYiQe/oyclyFZfA/1gAZ0W3u6gi9gBAarN2dZGxu+EEtQ3nedHAk0lAdEL7KU8LH4 hcxz7EptLf4IPctnbeOt+wdx58JYCIKm2Zda2Pw5txCLQNn5OMWgKaQrURfe8Em57BCs LiJMNoAqsYKDU4wrwrqmu6w0YZYoFxw2ZV9YC1Zuz4owf2UG2XTmW/UP3HOGJ5p15jPe lIWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=XMKiv7e0HE0Nq9EZ2ycwXQWDUdKtFL2Ke8wIhC5idas=; b=aSzG/coMSGiVKogK4q5eil/jcsh7jj3jJnqBwVV3W4eBREaUXArzV8JVNay7P88MsZ SaNHjNSqHIF1a0SncWDmzQqNveN+lE+h/Uccn09mLMEnMUMhBKXAIiWpYH3+bgzPZ/qe RHfdR3MheYdcjkQqto7u8dnvQZS8j9CEEkJ9phEaArJoShD2R8XrSUPKUxWy9q8IaqAb F3/AlhJmDbIOkgqmgHjWqxu3k77Yy3Kmy/MxsHtQjONQhw3sdjxj8QtOJS20MTUfzNna 4Douq0IHLX5C2K3ZBGLgTaxPScCGFasxPtqkW4v4/mBzh7mgMl+TxE1dtYyrXaRER98b OHOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=AeQoKhdr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id sc9-20020a1709078a0900b0076f061ffab4si6202562ejc.51.2022.09.22.07.25.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 07:25:09 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=AeQoKhdr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3F9E93857C58 for ; Thu, 22 Sep 2022 14:24:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F9E93857C58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663856691; bh=XMKiv7e0HE0Nq9EZ2ycwXQWDUdKtFL2Ke8wIhC5idas=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=AeQoKhdriVYfbaYK2BJ9U5ukBX2ijk4jD+swrxJxXNaHHZSuEEuQgzwkfiQhAeqpi d1ozFEQPNp3ttgS3Z08VleXh7NBtOAmPcmoa5gKBYmoGBVMvqJYGITKdROcdYCYkHB vvE3j2vUYcQS9fsgG3Yu17sabWlxh/U8c1sj/6vE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id EB91C38582B5 for ; Thu, 22 Sep 2022 14:23:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB91C38582B5 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-46-a372HzqTNpeTseujdroyLw-1; Thu, 22 Sep 2022 10:23:54 -0400 X-MC-Unique: a372HzqTNpeTseujdroyLw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 515EE1C07820; Thu, 22 Sep 2022 14:23:54 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0F211121314; Thu, 22 Sep 2022 14:23:53 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 1/2] libstdc++: Rearrange tests for Date: Thu, 22 Sep 2022 15:23:52 +0100 Message-Id: <20220922142353.1139862-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1744680213471268608?= X-GMAIL-MSGID: =?utf-8?q?1744680213471268608?= 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 --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