From patchwork Mon Jul 22 16:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WYIT6kzR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSQpC3YFpz1yZ7 for ; Tue, 23 Jul 2024 02:33:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BFC47385EC59 for ; Mon, 22 Jul 2024 16:33:53 +0000 (GMT) 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 ESMTP id 6CB373858C33 for ; Mon, 22 Jul 2024 16:31:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6CB373858C33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6CB373858C33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665920; cv=none; b=CpK/ls121R4n3sq0Ifo376g5P844Ztsy4lIc/f2aaEyqWx3YvwAV8Cdn2b4687+xZDVFsSudz3zKiYrflY8irnf3YhObmuE1jpLWwCrjUf61TKpiegoliHF5ngrFr9eIkKJIuSCnJyKZyXSl40pybfIOnPp3qAM8hT6W7bLqvys= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665920; c=relaxed/simple; bh=t+W0WQZbLuYhwd0Cyi7ipsrBLpW5DEw2MOUDOsF0kyI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=fPnbOgoK8Qbv4AzvXd5/zuwrE9a8pOqCq9q0VESvxpfnnyZ88obLmX7rgnfMU039JIimF8UBZT3ijpe9PaBxIvORvAvQDy0YRa9cE14n22a21meaZCgE6gmEuhowgt3NxnLeh2psNcFgo6nPGvuzOL0sk+3tIMS/cY1TxNqo5nA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GDQyyFiLTS2uSOc5+UoIGeYCPLzNX9b1Uf4iDX6pidQ=; b=WYIT6kzRIJKq/KvTbSSqgXdj4nVe6kEPgP0wJIN5Qx8lAgr/q0knvGK0cYupsNUCaYkhri Wbwr5F8CVgyUn7T48NNjuVSkK5Jv+P37+s4U2RHCEP7SC6iogycxV6L+XHFgutQ17KzAW9 +sIJNT51iVj4aBCg2tVBnu6YPFLoaYI= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-696-_G9u7FnaOimXIhgUD0n_yA-1; Mon, 22 Jul 2024 12:30:24 -0400 X-MC-Unique: _G9u7FnaOimXIhgUD0n_yA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 88E321955BF6; Mon, 22 Jul 2024 16:30:13 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2E20195605F; Mon, 22 Jul 2024 16:30:11 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 1/8] libstdc++: Clean up @diff@ markup in some I/O tests Date: Mon, 22 Jul 2024 17:28:35 +0100 Message-ID: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org 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 // . -// 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 // . -// 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 // . -// 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 // . -// 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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions #include #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,10 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,10 +25,6 @@ #include #include -// @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 // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } @@ -25,9 +25,6 @@ #include #include -// @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 #include -// @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 #include -// @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 #include -// @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 #include -// @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 // . -// 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 // . -// 27.8.1.10 ofstream member functions -// @require@ %-*.tst -// @diff@ %-*.tst %-*.txt +// C++98 27.8.1.10 ofstream member functions #include #include #include -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 // . -// 27.4.2.4 ios_base static members -// @require@ %-*.tst -// @diff@ %-*.tst %-*.txt +// C++98 27.4.2.4 ios_base static members #include #include