I've pushed this series to trunk now.
On Mon, 22 Jul 2024 at 17:34, Jonathan Wakely <jwak...@redhat.com> wrote:
>
> Tested x86_64-linux.
>
> -- >8 --
>
> We have a number of 27_io/* tests with comments like this:
>
> // @require@ %-*.tst
> // @diff@ %-*.tst %-*.txt
>
> It seems that these declare required data files used by the test and a
> post-test action to compare the test output with the expected result.
> We do have tests that depend on some *.tst and/or *.txt files that are
> copied from testsuite/data into each test's working directory before it
> runs, so the comments are related to those dependencies. However,
> nothing in the current test framework actually makes use of these
> comments. Currently, every test gets a fresh copy of every *.tst and
> *.txt file in the testsuite/data directory, whether the test actually
> requires them or not.
>
> This change is the first in a series to clean up this unused markup in
> the tests. This first step is to just remove all @require@ and @diff@
> comments where they seem to serve no purpose at all. These tests do not
> open any of the *.tst or *.txt files that are copied into the test's
> working directory from the testsuite/data directory, so they don't
> "require" any of those files, and there's no need to "diff" them after
> the test runs.
>
> libstdc++-v3/ChangeLog:
>
> * testsuite/27_io/basic_filebuf/close/char/4879.cc: Remove
> @require@ and @diff@ comments.
> * testsuite/27_io/basic_filebuf/close/char/9964.cc: Likewise.
> * testsuite/27_io/basic_filebuf/open/char/3.cc: Likewise.
> * testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/snextc/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc:
> Likewise.
> * testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc:
> Likewise.
> * testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc:
> Likewise.
> * testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc:
> Likewise.
> * testsuite/27_io/basic_filebuf/sputc/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sputc/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sputn/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sputn/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc: Likewise.
> * testsuite/27_io/basic_filebuf/sputc/char/1-io.cc: Likewise.
> Remove unused variable.
> * testsuite/27_io/basic_filebuf/sputn/char/2-io.cc: Likewise.
> * testsuite/27_io/basic_ofstream/cons/char/1.cc: Remove
> @require@ and @diff@ comments. Remove unused variables.
> * testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc: Remove
> * testsuite/27_io/ios_base/sync_with_stdio/2.cc: Likewise.
> ---
> .../testsuite/27_io/basic_filebuf/close/char/4879.cc | 4 +---
> .../testsuite/27_io/basic_filebuf/close/char/9964.cc | 4 +---
> .../testsuite/27_io/basic_filebuf/open/char/3.cc | 4 +---
> .../testsuite/27_io/basic_filebuf/open/char/9507.cc | 4 +---
> .../testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/snextc/char/2-out.cc | 5 +----
> .../27_io/basic_filebuf/sputbackc/char/1-io.cc | 5 +----
> .../27_io/basic_filebuf/sputbackc/char/1-out.cc | 5 +----
> .../27_io/basic_filebuf/sputbackc/char/2-io.cc | 5 +----
> .../27_io/basic_filebuf/sputbackc/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sputc/char/1-io.cc | 6 +-----
> .../testsuite/27_io/basic_filebuf/sputc/char/1-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sputc/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sputn/char/1-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sputn/char/2-io.cc | 6 +-----
> .../testsuite/27_io/basic_filebuf/sputn/char/2-out.cc | 5 +----
> .../testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc | 3 ---
> .../27_io/basic_filebuf/sungetc/char/1-out.cc | 3 ---
> .../testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc | 3 ---
> .../27_io/basic_filebuf/sungetc/char/2-out.cc | 3 ---
> .../testsuite/27_io/basic_ofstream/cons/char/1.cc | 4 +---
> .../testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc | 10 +---------
> .../testsuite/27_io/ios_base/sync_with_stdio/2.cc | 4 +---
> 28 files changed, 24 insertions(+), 109 deletions(-)
>
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
> index 22ccbe70e58..febc8f31a15 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
> @@ -18,9 +18,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.3 filebuf member functions
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.3 filebuf member functions
>
> // various tests for filebuf::open() and filebuf::close() including
> // the non-portable functionality in the libstdc++-v3 IO library
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
> index d9d73493c2a..796bf5ebdff 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
> @@ -18,9 +18,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.3 filebuf member functions
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.3 filebuf member functions
>
> // various tests for filebuf::open() and filebuf::close() including
> // the non-portable functionality in the libstdc++-v3 IO library
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
> index 46ce5032502..abfe2f5731c 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
> @@ -15,9 +15,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.3 filebuf member functions
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.3 filebuf member functions
>
> // various tests for filebuf::open() and filebuf::close() including
> // the non-portable functionality in the libstdc++-v3 IO library
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
> index 79ab5d6d756..4af5ed3a90d 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
> @@ -17,9 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.3 filebuf member functions
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.3 filebuf member functions
>
> // various tests for filebuf::open() and filebuf::close() including
> // the non-portable functionality in the libstdc++-v3 IO library
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
> index 378f7dc275d..a955ae2d494 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sbumpc_1out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
> index df1df2b9f88..e78c37cb3ab 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sbumpc_2out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
> index b941e4fd619..2d4355185d9 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sgetc_1out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
> index 29d79e52c63..bf2082e4cc7 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sgetc_2out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
> index e5052b208b8..5377e69b6ca 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sgetn_1out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
> index 158b3c4f5c1..267310e836d 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sgetn_2out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
> index fac0654a86f..5003c848c42 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
> @@ -17,15 +17,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> #include <fstream>
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_snextc_2out.tst"; // empty file, need to create
>
> void test05()
> diff --git
> a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
> index 8c467fb404b..59b8970d470 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sputbackc_1io.tst"; // empty file, need to create
>
> void test01()
> diff --git
> a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
> index cd6c7aec457..01d1c59f8e7 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sputbackc_1out.tst"; // empty file, need to
> create
>
> // Test overloaded virtual functions.
> diff --git
> a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
> index c33009fdd1f..b2d86b6c54c 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sputbackc_2io.tst"; // empty file, need to create
>
> void test01()
> diff --git
> a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
> index f56c0620a39..102bcf86e66 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sputbackc_2out.tst"; // empty file, need to
> create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
> index 9bb32e237fd..25a82090c98 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,10 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> -const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
> const char name_03[] = "tmp_sputc_1io.tst";
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
> index 0bed58c0235..28ad3ce1b13 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sputc_1out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
> index dfe71b4a309..762ab6f62d5 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sputc_2out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
> index f3a203ee2ab..4bf37438b8d 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sputn_1out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
> index fb5a0dc6002..3f711ad5c56 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,10 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> -const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
> const char name_03[] = "tmp_sputn_2io.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
> index 5fc75543ab9..d1c252511f4 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
> @@ -17,7 +17,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.4 Overridden virtual functions
> +// C++98 27.8.1.4 Overridden virtual functions
>
> // { dg-require-fileio "" }
>
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_02[] = "tmp_sputn_2out.tst"; // empty file, need to create
>
> void test05()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
> index b4ff4045886..cf28372d2d5 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sungetc_1io.tst"; // empty file, need to create
>
> void test01()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
> index 52c33f60eca..2a48362b1be 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
> @@ -23,9 +23,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sungetc_1out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
> index 0791f42d847..11239553476 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
> @@ -25,9 +25,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sungetc_2io.tst"; // empty file, need to create
>
> void test01()
> diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
> b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
> index 76c61a1d8ce..d131fd8862e 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
> @@ -23,9 +23,6 @@
> #include <testsuite_hooks.h>
> #include <testsuite_io.h>
>
> -// @require@ %-*.tst %-*.txt
> -// @diff@ %-*.tst %*.txt
> -
> const char name_01[] = "tmp_sungetc_2out.tst"; // empty file, need to create
>
> // Test overloaded virtual functions.
> diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
> b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
> index 2c5c3d8525e..79f56b72dc7 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
> @@ -15,9 +15,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.10 ofstream member functions
> -// @require@ %-*.tst
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.10 ofstream member functions
>
> // { dg-require-fileio "" }
>
> diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
> b/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
> index 0b1594bf2a7..15575f7c710 100644
> --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
> +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
> @@ -15,16 +15,12 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.8.1.10 ofstream member functions
> -// @require@ %-*.tst
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.8.1.10 ofstream member functions
>
> #include <ostream>
> #include <fstream>
> #include <testsuite_hooks.h>
>
> -const char name_01[] = "ofstream_members-1.tst";
> -
> void
> redirect_buffer(std::ios& stream, std::streambuf* new_buf)
> { stream.rdbuf(new_buf); }
> @@ -36,10 +32,6 @@ active_buffer(std::ios& stream)
> // libstdc++/2832
> void test03()
> {
> - const char* strlit01 = "fuck war";
> - const std::string str00;
> - const std::string str01(strlit01);
> - std::string str02;
> std::filebuf fbuf;
> std::streambuf* pbasebuf0 = &fbuf;
>
> diff --git a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
> b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
> index 043bafbd32f..65908feffbd 100644
> --- a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
> +++ b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
> @@ -19,9 +19,7 @@
> // with this library; see the file COPYING3. If not see
> // <http://www.gnu.org/licenses/>.
>
> -// 27.4.2.4 ios_base static members
> -// @require@ %-*.tst
> -// @diff@ %-*.tst %-*.txt
> +// C++98 27.4.2.4 ios_base static members
>
> #include <cstdio>
> #include <sstream>
> --
> 2.45.2
>
