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 From patchwork Mon Jul 22 16:28:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963335 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=ZkJqCtMQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WSQnL1VhSz1yZ7 for ; Tue, 23 Jul 2024 02:33:10 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 03493386102E for ; Mon, 22 Jul 2024 16:33:08 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 2C7713858C52 for ; Mon, 22 Jul 2024 16:30:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C7713858C52 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 2C7713858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; cv=none; b=ltR8JA41jipKVzU9TUr28ZICncPRv8zN6geiWBpEM77tRCz0MUUcZ17eZE7uP1sprvXjS/FwBoCun6ovUQCT6YsmcGARP5HFZkakebpTI7r/L4rG+k5Tcwh4i1byLK38obd/8NhMea76+RGAKjF7D4v4kHoPZQuSUoV4h5pvKBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; c=relaxed/simple; bh=+HMp2Pi6NFdlpVRzW+kZQuH0RA8J1dADZD0swmuiqak=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=VzCaoXMAKKR326+hciZfo5uQEp0KmBiGuvABdGxsztniNi/bx+xvHEjCwo5majDRTGYblLNBdBNFhYQVDYig6EK4kzCvR3AFOgl3sHdpKza4Gwr0nL3BaE2I6s+BUX93Vrpwt11J85/Zi6/JdkEkCEcM9mEIH5SrYpydmXDqtWQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665821; 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: in-reply-to:in-reply-to:references:references; bh=FGzxqGaiXg57xSkm9twXeUPUfiYQpJrNhB84r5Zc1m4=; b=ZkJqCtMQ+UHl2Dqe8NHOgzAMxuVBVN1HmeK6CU2KuoB8oyvDtPZjDPdo42V6EEQ5SVudGP QJUOSOTXMLPNYqTd4Oyy1zpJyn4I7859UdBGFLMXYII7cNpAtEMczSgHwbSkYXyIblTloo kEdYaZMV0jV+2Upq/bVQnXk2bEO5FRY= Received: from mx-prod-mc-01.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-625-0PAs41E5ND6YQ9FvS_pFjg-1; Mon, 22 Jul 2024 12:30:18 -0400 X-MC-Unique: 0PAs41E5ND6YQ9FvS_pFjg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54E8A1944B31; Mon, 22 Jul 2024 16:30:17 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 33FC91955E80; Mon, 22 Jul 2024 16:30:14 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 2/8] libstdc++: Replace @require@ markup in some I/O tests Date: Mon, 22 Jul 2024 17:28:36 +0100 Message-ID: <20240722163010.3508334-2-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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_H3, 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 can replace the @require@ markup with { dg-additional-files ... } directives, so that the required files are explicitly named and are explicitly copied into place for tests that require it. This will allow a later change to remove the "Copy all required data files" step in the proc libstdc++_init in testsuite/lib/libstdc++.exp that is marked TODO. This commit uses dg-additional-files for a subset of the files that contain @require@. Also remove the @diff@ markup where appears to be copy & pasted from other test files, and so serves no purpose. For example, there is no output file created by 27_io/basic_ifstream/cons/char/1.cc so there is nothing for @diff@ to compare. Maybe the purpose was to check that reading the .tst file with an ifstream doesn't change it, but we've survived without doing those comparisons for many years so I think we can remove those cases of @diff@ markup. libstdc++-v3/ChangeLog: * testsuite/27_io/basic_filebuf/close/char/2.cc: Remove @require@ and @diff@ markup. Use dg-additional-files. Remove unused variable. * testsuite/27_io/basic_filebuf/close/char/3.cc: Remove @require@ and @diff@ markup. Use dg-additional-files. * testsuite/27_io/basic_filebuf/close/char/4.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/5.cc: Likewise. * testsuite/27_io/basic_filebuf/in_avail/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/is_open/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Likewise. * testsuite/27_io/basic_filebuf/snextc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/snextc/char/1-io.cc: Likewise. * testsuite/27_io/basic_filebuf/snextc/char/1-out.cc: Likewise. * testsuite/27_io/basic_filebuf/snextc/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/snextc/char/2-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sputc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sputc/char/2-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sputc/char/2-io.cc: Likewise. * testsuite/27_io/basic_filebuf/sputn/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sputn/char/1-io.cc: Likewise. Remove unused variable. * testsuite/27_io/basic_filebuf/sputn/char/2-in.cc: Remove @require@ and @diff@ markup. Use dg-additional-files. * testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc: Likewise. * testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc: Likewise. * testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise. * testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc: Likewise. * testsuite/27_io/basic_istream/readsome/char/6746-2.cc: Likewise. * testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc: Likewise. * testsuite/27_io/basic_istream/seekg/char/sstream.cc: Likewise. * testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc: Likewise. * testsuite/27_io/basic_istream/tellg/char/1.cc: Likewise. * testsuite/27_io/basic_istream/tellg/char/sstream.cc: Likewise. * testsuite/27_io/basic_istream/tellg/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc: Likewise. * testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise. * testsuite/lib/dg-options.exp (dg-additional-files): Append to v3_additional_files instead of replacing. * testsuite/lib/libstdc++.exp (v3_target_compile): Reset v3_additional_files after copying files. --- .../testsuite/27_io/basic_filebuf/close/char/2.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/close/char/3.cc | 5 ++--- .../testsuite/27_io/basic_filebuf/close/char/4.cc | 5 ++--- .../testsuite/27_io/basic_filebuf/close/char/5.cc | 8 ++++---- .../testsuite/27_io/basic_filebuf/in_avail/char/1.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/is_open/char/1.cc | 5 ++--- .../testsuite/27_io/basic_filebuf/open/char/1.cc | 5 ++--- .../testsuite/27_io/basic_filebuf/open/char/2.cc | 5 ++--- .../testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc | 6 ++---- .../27_io/basic_filebuf/seekoff/char/1-in.cc | 6 ++---- .../27_io/basic_filebuf/seekoff/char/1-out.cc | 6 ++---- .../27_io/basic_filebuf/seekoff/char/2-in.cc | 6 ++---- .../27_io/basic_filebuf/seekoff/char/2-out.cc | 6 ++---- .../27_io/basic_filebuf/seekpos/char/1-in.cc | 6 ++---- .../27_io/basic_filebuf/seekpos/char/1-out.cc | 6 ++---- .../27_io/basic_filebuf/seekpos/char/2-in.cc | 6 ++---- .../27_io/basic_filebuf/seekpos/char/2-out.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/snextc/char/1-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/snextc/char/1-io.cc | 6 ++---- .../27_io/basic_filebuf/snextc/char/1-out.cc | 7 +++---- .../testsuite/27_io/basic_filebuf/snextc/char/2-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/snextc/char/2-io.cc | 6 ++---- .../27_io/basic_filebuf/sputbackc/char/1-in.cc | 6 ++---- .../27_io/basic_filebuf/sputbackc/char/2-in.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sputc/char/1-in.cc | 7 +++---- .../testsuite/27_io/basic_filebuf/sputc/char/2-in.cc | 7 +++---- .../testsuite/27_io/basic_filebuf/sputc/char/2-io.cc | 6 ++---- .../testsuite/27_io/basic_filebuf/sputn/char/1-in.cc | 7 +++---- .../testsuite/27_io/basic_filebuf/sputn/char/1-io.cc | 7 ++----- .../testsuite/27_io/basic_filebuf/sputn/char/2-in.cc | 7 +++---- .../27_io/basic_filebuf/sungetc/char/1-in.cc | 3 +-- .../27_io/basic_filebuf/sungetc/char/2-in.cc | 4 +--- .../testsuite/27_io/basic_ifstream/cons/char/1.cc | 5 ++--- .../testsuite/27_io/basic_ifstream/open/char/1.cc | 5 ++--- .../testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc | 11 +---------- .../27_io/basic_istream/readsome/char/6746-2.cc | 5 ++--- .../27_io/basic_istream/readsome/wchar_t/6746-2.cc | 5 ++--- .../27_io/basic_istream/seekg/char/sstream.cc | 5 ++--- .../27_io/basic_istream/seekg/wchar_t/sstream.cc | 5 ++--- .../testsuite/27_io/basic_istream/tellg/char/1.cc | 5 ++--- .../27_io/basic_istream/tellg/char/sstream.cc | 5 ++--- .../testsuite/27_io/basic_istream/tellg/wchar_t/1.cc | 5 ++--- .../27_io/basic_istream/tellg/wchar_t/sstream.cc | 5 ++--- .../testsuite/27_io/basic_ofstream/open/char/1.cc | 5 +++-- libstdc++-v3/testsuite/lib/dg-options.exp | 2 +- libstdc++-v3/testsuite/lib/libstdc++.exp | 1 + 57 files changed, 117 insertions(+), 208 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc index c7f655d0bb7..fd71faed734 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc @@ -16,10 +16,9 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } -// 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 @@ -39,7 +38,6 @@ // this bug/situation. const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it -const char name_02[] = "filebuf_virtuals-2.txt"; // empty file, need to create void test_02() { diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc index ff0b9a5fb7e..cd7550f5677 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc @@ -17,13 +17,12 @@ // with this library; see the file COPYING3. If not see // . -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.3 filebuf member functions #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt +// { dg-additional-files "filebuf_virtuals-1.txt" } // NB: This test assumes that _M_buf_size == 40, and not the usual // buffer_size length of BUFSIZ (8192), so that overflow/underflow can be diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc index 0e0949d79e9..931da865247 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc @@ -18,10 +18,9 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } -// 27.8.1.3 filebuf member functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.8.1.3 filebuf member functions // Test that upon filebuf::close() 27.8.1.1,3 is enforced. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc index 6402c77b44a..29804fb5014 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc @@ -17,11 +17,11 @@ // 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 -// Test that upon filebuf::close() 27.8.1.1,3 is enforced. +// { dg-additional-files "filebuf_virtuals-1.txt" } + +// Test that upon filebuf::close() 27.8.1.1 p3 is enforced. #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc index 505293021ea..40b15317d69 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc @@ -17,16 +17,14 @@ // 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 "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - // NB: This test assumes that _M_buf_size == 40, and not the usual // buffer_size length of BUFSIZ (8192), so that overflow/underflow can be // simulated a bit more readily. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc index 54fb0094567..d8e23e534f6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc @@ -15,14 +15,13 @@ // 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 // { dg-require-fileio "" } +// { dg-additional-files "filebuf_members-1.tst filebuf_members-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc index 7a5321bd80c..4ca94cf4879 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc @@ -15,14 +15,13 @@ // 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 // { dg-require-fileio "" } +// { dg-additional-files "filebuf_members-1.tst filebuf_members-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc index 5801b2ad379..cdd06d38c35 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc @@ -15,14 +15,13 @@ // 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 // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc index 0f419c1df6d..b3733cc6916 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc index eceae02f5b3..439f8de29c6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_03[] = "tmp_sbumpc_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc index 8c4230c7091..d5b60e488b0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc index b8a152ad82a..b265cd55db4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_03[] = "tmp_sbumpc_2io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc index c8584c2f18b..47d1b897963 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekoff.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekoff.txt"; void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc index f78612cae88..7220b22c24c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekoff-1out.tst" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekoff-1out.tst"; void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc index 7c3784f84dd..d69f2907773 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekoff.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekoff.txt"; void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc index c4b0d4b72bc..e07b2097916 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekoff-2out.tst" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekoff-2out.tst"; void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc index 88c6c7eee87..4e7d98716c1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekpos.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekpos.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc index a6cfbfc3e6e..7c0486ef8ca 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekpos-1out.tst" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekpos-1out.tst"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc index 05eed15af24..3f80ec92079 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekpos.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekpos.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc index c1d7bf754ce..d0b34c23a4c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "seekpos-2out.tst" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "seekpos-2out.tst"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc index 1e6dfd2bda3..27b8c5cc2e4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc index 8f1f36c15cb..f9d68f6be0a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_03[] = "tmp_sgetc_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc index aca1593d5b5..955af5b6848 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc index b233df872d0..4fea4585ba7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_03[] = "tmp_sgetc_2io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc index 9791706a99f..2af5cb4493c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc @@ -21,18 +21,16 @@ // causes "in_avail" to return an incorrect value. // { dg-do run { xfail arm*-*-elf arm*-*-eabi } } -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "sgetn.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetn.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc index 506d0676bd5..6ad69300323 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc @@ -21,18 +21,16 @@ // causes "in_avail" to return an incorrect value. // { dg-do run { xfail arm*-*-elf arm*-*-eabi } } -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "sgetn.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetn.txt"; // file with data in it const char name_03[] = "tmp_sgetn_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc index 1b16f5d0b49..57074832062 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc @@ -21,18 +21,16 @@ // causes "in_avail" to return an incorrect value. // { dg-do run { xfail arm*-*-elf arm*-*-eabi } } -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "sgetn.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetn.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc index c185a4adb1e..c3112f718a8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc @@ -21,18 +21,16 @@ // causes "in_avail" to return an incorrect value. // { dg-do run { xfail arm*-*-elf arm*-*-eabi } } -// 27.8.1.4 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "sgetn.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetn.txt"; // file with data in it const char name_03[] = "tmp_sgetn_2io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc index e79972af7b2..0e5078c5a13 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc index a02aef40ccf..974c661c4ab 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc index b724f13c73b..a61a77b96c2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc @@ -17,15 +17,14 @@ // 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-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc index fa681efc83e..b2c754e5de3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc index c264412c103..0f62d465d4c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it const char name_03[] = "tmp_snextc_2io.tst"; // empty file, need to create diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc index c9e54caba81..642ed9e52f5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc index 684685dde74..1e4325e79b7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc index bbd25a5e85e..e76064dd592 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc @@ -17,15 +17,14 @@ // 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-additional-files "filebuf_virtuals-1.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc index 7505076f97c..c0d423bf063 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc @@ -17,15 +17,14 @@ // 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-additional-files "filebuf_virtuals-1.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc index 3125d52b42c..f182064ca19 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc @@ -17,17 +17,15 @@ // 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 "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #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_2io.tst"; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc index dd951b040b4..fb9b181ad6c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc @@ -17,15 +17,14 @@ // 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-additional-files "filebuf_virtuals-1.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc index c01aed97664..125cde14fdb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc @@ -17,18 +17,15 @@ // 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 "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #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_1io.tst"; // empty file, need to create void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc index 6a008646fb3..da96056c2ce 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc @@ -17,15 +17,14 @@ // 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-additional-files "filebuf_virtuals-1.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc index ff2f0fd742f..12bd7da3282 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc @@ -25,8 +25,7 @@ #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt +// { dg-additional-files "sgetc.txt" } const char name_01[] = "sgetc.txt"; // file with data in it diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc index af3ad03ef8a..9f34255b8ad 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc @@ -20,14 +20,12 @@ // 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "sgetc.txt" } #include #include #include -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %*.txt - const char name_01[] = "sgetc.txt"; // file with data in it // Test overloaded virtual functions. diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc index 2611caf54f9..f2658aed886 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc @@ -15,11 +15,10 @@ // with this library; see the file COPYING3. If not see // . -// 27.8.1.7 ifstream member functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.8.1.7 ifstream member functions // { dg-require-fileio "" } +// { dg-additional-files "ifstream_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc index dcd16eddf60..c22de5305a7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc @@ -15,11 +15,10 @@ // with this library; see the file COPYING3. If not see // . -// 27.8.1.7 ifstream member functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.8.1.7 ifstream member functions // { dg-require-fileio "" } +// { dg-additional-files "ifstream_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc index fac3275da67..3623da66dc2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc @@ -15,17 +15,12 @@ // with this library; see the file COPYING3. If not see // . -// 27.8.1.7 ifstream member functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.8.1.7 ifstream member functions #include #include #include -const char name_01[] = "ifstream_members-1.tst"; -const char name_02[] = "ifstream_members-1.txt"; - void redirect_buffer(std::ios& stream, std::streambuf* new_buf) { stream.rdbuf(new_buf); } @@ -37,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/basic_istream/readsome/char/6746-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc index 09cfc3aad0f..f18f60fa472 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc @@ -21,12 +21,11 @@ // causes "in_avail" to return an incorrect value. // { dg-do run { xfail arm*-*-elf arm*-*-eabi } } -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "istream_unformatted-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc index d19cb211f4e..3acd5fe7b1b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc @@ -21,10 +21,9 @@ // { dg-require-binary-io "" } // { dg-require-fileio "" } +// { dg-additional-files "wistream_unformatted-1.tst" } -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc index 1f9967405d8..72379664e33 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc @@ -17,12 +17,11 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "istream_seeks-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc index da2e27e72a0..30a8a905b6e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc @@ -17,12 +17,11 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "wistream_seeks-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc index e956ecf4e4a..3ab92f9760e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc @@ -17,12 +17,11 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "istream_seeks-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc index a45d0b59fb8..6da59d0d1a1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc @@ -17,12 +17,11 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "istream_seeks-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc index e2f076a03d1..20b425cbbe0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc @@ -16,11 +16,10 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "wistream_seeks-1.tst" } -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc index b5d005c5342..9118e683c35 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc @@ -15,12 +15,11 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "wistream_seeks-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc index b24ffe210ce..45227107cbd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc @@ -15,8 +15,9 @@ // with this library; see the file COPYING3. If not see // . -// 27.8.1.10 ofstream member functions -// @require@ %-*.tst +// C++98 27.8.1.10 ofstream member functions + +// { dg-additional-files "ofstream_members-1.tst" } // @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 0d77fb029b0..1d3160409f5 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -405,5 +405,5 @@ set v3_additional_files "" # Process a { dg-additional-files "filelist" } directive in the test. proc dg-additional-files { line filelist } { global v3_additional_files - set v3_additional_files $filelist + append v3_additional_files " " $filelist } diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 67a63f5b5f3..8efc6f7f089 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -648,6 +648,7 @@ proc v3_target_compile { source dest type options } { global srcdir v3-copy-file "$srcdir/data/$file" $file } + set v3_additional_files {} set comp_output [target_compile $source $dest $type $options] if { $type == "executable" && $file_to_delete != "" } { From patchwork Mon Jul 22 16:28:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963331 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=SJpcztlv; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WSQlW5Wy9z1yZ7 for ; Tue, 23 Jul 2024 02:31:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 76CBB385C6C6 for ; Mon, 22 Jul 2024 16:31:33 +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 AD59D3858C33 for ; Mon, 22 Jul 2024 16:30:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD59D3858C33 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 AD59D3858C33 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=1721665827; cv=none; b=VbmojI10wux1BjrPhy6WTpW1ujLFUuEjfcT9d7Pa+d0vDfnv8KqpJw5uVw+UaMPACK7wGwgiCue0x9nCP51SCtzLCYCC54cZN0CjGdV+LcGzUuyz+t3VgS5VhDnJ1LvC8upVGBjCZsF2o/cvk7DHdm+XWaiu7M1aNU9GZuvRSYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665827; c=relaxed/simple; bh=eKFkKzPQbCdkviwQDWRqFBoQL0ouo2+0KEGP6SmfXpM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=lE5v9A4YXQqKw4CWMAhJFah/PMwNEgLNA54lHpQjz8i7Dk9ybK/JDdgke+fdVzg57Selug+UlDH1D+0C91OfksRAj0d0aX8ELbHGM2RaB+Huyc9WpKoMi2fc9V3/0AVqtF1g+4sNheVHSQuJddaUKKEMAg2r61wn4dj4fMiXzrs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665822; 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: in-reply-to:in-reply-to:references:references; bh=U6RxuXbGWuYpgyY6cIRG0lN2RItKepV/fJpKjqmA5aw=; b=SJpcztlvRdi7SYoE80TiyGCviwWpYHb3YksuZGBQK54DqDw1gRQD2rM+70Wcmnit2LsKox 55gHzdW5PqwvqIhYtOUJVPzEUwYwarBHsfAim2i3nwsGYk6tdUH+JFNiAXGcS9i+Z0Pj4j r8utAiXtuL34jxz5tZohC1eLbcVciI0= Received: from mx-prod-mc-03.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-572-si0mlN_QPpiQFmswZr2wlA-1; Mon, 22 Jul 2024 12:30:20 -0400 X-MC-Unique: si0mlN_QPpiQFmswZr2wlA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AB50A1955D45; Mon, 22 Jul 2024 16:30:19 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D8C741955D52; Mon, 22 Jul 2024 16:30:18 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 3/8] libstdc++: Use dg-additional-files in some I/O tests Date: Mon, 22 Jul 2024 17:28:37 +0100 Message-ID: <20240722163010.3508334-3-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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, URIBL_SBL_A 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 -- Use the dg-additional-files directive to declare files that need to be copied into the test's working directory. This is currently redundant (as all .tst and .txt files are copied for all tests) but is a step towards not copying all files. libstdc++-v3/ChangeLog: * testsuite/27_io/basic_filebuf/imbue/char/2.cc: Use dg-additional-files. * testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/path.cc: Likewise. * testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc: Likewise. * testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/sgetn/char/3.cc: Likewise. * testsuite/27_io/basic_filebuf/underflow/10096.cc: Likewise. * testsuite/27_io/basic_fstream/cons/char/path.cc: Likewise. * testsuite/27_io/basic_fstream/open/char/path.cc: Likewise. * testsuite/27_io/basic_ifstream/assign/1.cc: Likewise. * testsuite/27_io/basic_ifstream/cons/move.cc: Likewise. * testsuite/27_io/basic_ifstream/cons/char/path.cc: Likewise. * testsuite/27_io/basic_ifstream/open/char/path.cc: Likewise. * testsuite/27_io/basic_ifstream/open/wchar_t/1.cc: Likewise. * testsuite/27_io/objects/char/10.cc: Likewise. * testsuite/27_io/objects/char/12048-1.cc: Likewise. * testsuite/27_io/objects/char/12048-2.cc: Likewise. * testsuite/27_io/objects/char/12048-3.cc: Likewise. * testsuite/27_io/objects/char/12048-4.cc: Likewise. * testsuite/27_io/objects/char/12048-5.cc: Likewise. * testsuite/27_io/objects/wchar_t/12048-1.cc: Likewise. * testsuite/27_io/objects/wchar_t/12048-2.cc: Likewise. * testsuite/27_io/objects/wchar_t/12048-3.cc: Likewise. * testsuite/27_io/objects/wchar_t/12048-4.cc: Likewise. * testsuite/27_io/objects/wchar_t/12048-5.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/char/12048-1.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/char/12048-2.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/char/12048-3.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/char/12048-4.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc: Likewise. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc: Likewise. --- libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc | 4 +++- libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc | 1 + libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc | 1 + .../testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc | 1 + .../testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc | 3 ++- .../testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc | 3 ++- .../testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc | 1 + .../testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc | 1 + libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc | 1 + libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc | 1 + libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc | 1 + libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc | 1 + libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc | 1 + libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc | 3 ++- libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc | 1 + libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc | 3 ++- libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc | 1 + libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc | 3 ++- libstdc++-v3/testsuite/27_io/objects/char/10.cc | 1 + libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc | 1 + libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc | 1 + libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc | 1 + libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc | 1 + libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc | 1 + libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc | 1 + libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc | 1 + libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc | 1 + libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc | 1 + libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc | 1 + libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc | 1 + libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc | 1 + libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc | 1 + libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc | 1 + .../testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc | 2 ++ .../testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc | 2 ++ .../testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc | 2 ++ .../testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc | 2 ++ 37 files changed, 48 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc index aa2e1560178..c76631666f4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc @@ -19,7 +19,9 @@ // 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-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc index 92faee0766d..ad119deb33f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc @@ -1,4 +1,5 @@ // { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-additional-files "filebuf_virtuals-1.txt" } // 2003-05-13 Benjamin Kosnik diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc index 0df22f2a47e..81e15e289b4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++17 } } // { dg-require-fileio "" } // { dg-require-filesystem-ts "" } +// { dg-additional-files "filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc index e074bd8899b..e02a004a506 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc @@ -20,6 +20,7 @@ // 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc index 6ca42a2dbdf..6403a8e643c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc @@ -17,9 +17,10 @@ // with this library; see the file COPYING3. If not see // . -// 27.7.1.3 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc index 853eec405da..2cea0145d1a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc @@ -17,9 +17,10 @@ // with this library; see the file COPYING3. If not see // . -// 27.7.1.3 Overridden virtual functions +// C++98 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc index 4124dd84fc5..b91845476a8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc @@ -20,6 +20,7 @@ // 27.7.1.3 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc index f4bf73f46e4..c89f9bccec1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc @@ -20,6 +20,7 @@ // 27.7.1.3 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc index 7b77394cfaf..ca60379ef1f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc @@ -20,6 +20,7 @@ // 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc index 699875c5dd9..cf5c7c8bd4d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc @@ -20,6 +20,7 @@ // 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "sgetn.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc index b7a9d4d644a..02b4ab65590 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc @@ -20,6 +20,7 @@ // 27.8.1.4 Overridden virtual functions // { dg-require-fileio "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc index 7fdcd2b4461..9f2865ff572 100644 --- a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc +++ b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++17 } } // { dg-require-fileio "" } // { dg-require-filesystem-ts "" } +// { dg-additional-files "ofstream_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc index 141e614d8d1..01b149418b4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc +++ b/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++17 } } // { dg-require-fileio "" } // { dg-require-filesystem-ts "" } +// { dg-additional-files "filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc index e6b71b919f2..210a0870ef0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc @@ -17,8 +17,9 @@ // { dg-do run { target c++11 } } // { dg-require-fileio "" } +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } -// 27.9.1.8 Assign and swap [ifstream.assign] +// C++11 27.9.1.8 Assign and swap [ifstream.assign] #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc index bf3ebed1e07..060c2c8bcf3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++17 } } // { dg-require-fileio "" } // { dg-require-filesystem-ts "" } +// { dg-additional-files "ifstream_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc index 228965edfae..38cdb6494a3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc @@ -17,8 +17,9 @@ // { dg-do run { target c++11 } } // { dg-require-fileio "" } +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } -// 27.9.1.7 basic_ifstream constructors [ifstream.cons] +// C++11 27.9.1.7 basic_ifstream constructors [ifstream.cons] #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc index d58063e3d20..76a3a3d7fb9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc @@ -19,6 +19,7 @@ // { dg-do run { target c++17 } } // { dg-require-fileio "" } // { dg-require-filesystem-ts "" } +// { dg-additional-files "filebuf_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc index 243f732c859..097d33b2a1e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc @@ -15,10 +15,11 @@ // with this library; see the file COPYING3. If not see // . -// 30.9.3.1 basic_ifstream constructors [ifstream.cons] +// C++17 30.9.3.1 basic_ifstream constructors [ifstream.cons] // { dg-do run { target *-*-mingw* } } // { dg-require-fileio "" } +// { dg-additional-files "ifstream_members-1.tst" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/10.cc b/libstdc++-v3/testsuite/27_io/objects/char/10.cc index 3f30c9939e8..726a933aafe 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/10.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/10.cc @@ -19,6 +19,7 @@ // { dg-require-fileio "" } // { dg-require-binary-io "" } +// { dg-additional-files "filebuf_virtuals-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc index 4ee3a1942a3..2d1ae04500d 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc @@ -19,6 +19,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc index d6a656cbb20..c0ae079e7fc 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc index 4d2dcfa8902..8a10428c124 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc index 7cabf83d82d..4daa30fd020 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc index 7ddd97baef9..f579e91d3ab 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc @@ -24,6 +24,7 @@ // { dg-do run { xfail *-*-* } } // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc index 156bb01163b..434a85ded75 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc @@ -19,6 +19,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc index d7ef6577db5..6d1033c4054 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc index 5a97b2e4358..f38457be7bc 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc @@ -19,6 +19,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc index 7b9a99be953..58e16355887 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc index 13cd1061ef9..7efe4a2c6ef 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc @@ -21,6 +21,7 @@ // { dg-do run { xfail *-*-* } } // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc index abef61fa11b..ec57eaf8a8c 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc index 058b393814e..91db50b8ed5 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc index d3b89185bb0..e2f3100a22a 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc index e6076a93af2..72889fbd9b5 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "cin_unget-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc index 78248942c72..e71aee29cf2 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc @@ -17,6 +17,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-additional-files "cin_unget-1.txt" } + #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc index 1be110eec6b..529353787e9 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc @@ -20,6 +20,8 @@ #include #include +// { dg-additional-files "cin_unget-1.txt" } + // libstdc++/12048 void test03() { diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc index 51639d313c1..8274350b0e0 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc @@ -17,6 +17,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-additional-files "cin_unget-1.txt" } + #include #include diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc index 2362251eeaf..7989edc0c3f 100644 --- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc +++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc @@ -17,6 +17,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-additional-files "cin_unget-1.txt" } + #include #include From patchwork Mon Jul 22 16:28:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963332 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=RfN9fI5S; 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 4WSQlZ2ygkz1yZ7 for ; Tue, 23 Jul 2024 02:31:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F964386181F for ; Mon, 22 Jul 2024 16:31:36 +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 758553858416 for ; Mon, 22 Jul 2024 16:30:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 758553858416 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 758553858416 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=1721665831; cv=none; b=KuRbCRDb/uFkYIXHJEHj7X/DuECih/uN3YDyot2LuE6XHjQ+UAQQfyEetf8ctcjHglBL5cpYa/3X0UC87LaqxdJaf0JokE2xioSDhJfPfsRVwyKN7eRzbR8QoRt8mCTvRjhCAuVeuWrv+JEOfmyNom3PFainyE8ePDkdEeHEhD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665831; c=relaxed/simple; bh=U9sBxZsl1jxxFBh9tcFQa0z0TBzxjZjifb6pyuX5Bng=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=uj6/MBLbS9PpsA91c8z6/7v6K8nxokP55l6m6jRIis/t9EofA4zuVT4jR0oIP2Jq8yEeuQZwHqSS28Dto/4a9nTa5ulHA4msmRPCsUAh2CZPhDLgwmaoZwzVBBR1QpbBV7JxfBm+BvQCYQKF8MBgHV3F57JEW0oG297Dr6dtnoU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665826; 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: in-reply-to:in-reply-to:references:references; bh=271orfWAd1ULZu4cQbIE5KQJ8Fjua11gZX0h19w01Po=; b=RfN9fI5SQgzLTQ5FsgbWWk0/fMgtzyHexCBuUym9FWBDymlSbchztcqQZhxvb6E+HCILQA 7VRHkyQJqz7ROAjeo7qvhRJ4QeECcm634Flsv4ufzgKH5h4AIAHE+OfnFBcWQ7d4O05ruH Nnt84AxzV3kIPPDvWfAMA0f5crJ2lWk= Received: from mx-prod-mc-01.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-458-xdJIzQR8O0GFGOZIDNwriA-1; Mon, 22 Jul 2024 12:30:22 -0400 X-MC-Unique: xdJIzQR8O0GFGOZIDNwriA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A036C1955BED; Mon, 22 Jul 2024 16:30:21 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0978F1955D44; Mon, 22 Jul 2024 16:30:20 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 4/8] libstdc++: Add file-io-diff to replace @diff@ markup in I/O tests Date: Mon, 22 Jul 2024 17:28:38 +0100 Message-ID: <20240722163010.3508334-4-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=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.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 -- This adds a new dg-final action to compare two files after a test has run, so that we can verify that fstream operations produce the expected results. With this change, all uses of @diff@ that seem potentially useful have been converted to actually compare the files and FAIL if they differ. The file-io-diff action can take two arguments naming the files to be compared, or for convenience it can take a single string and will compare STR.tst and STR.txt, as that's how it's commonly used. Additionally, all remaining uses of @require@ are converted to dg-additional-files directives, so that the TODO in libstdc++.exp can be resolved. libstdc++-v3/ChangeLog: * testsuite/27_io/basic_filebuf/close/char/1.cc: Remove @require@ and @diff@. Use dg-final file-io-diff action. * testsuite/27_io/basic_istream/extractors_other/char/2.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_istream/get/char/2.cc: Likewise. * testsuite/27_io/basic_istream/get/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_istream/ignore/char/3.cc: Likewise. * testsuite/27_io/basic_istream/ignore/wchar_t/3.cc: Likewise. * testsuite/27_io/basic_istream/peek/char/6414.cc: Likewise. * testsuite/27_io/basic_istream/peek/wchar_t/6414.cc: Likewise. * testsuite/27_io/basic_istream/seekg/char/fstream.cc: Likewise. * testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc: Likewise. * testsuite/27_io/basic_istream/tellg/char/fstream.cc: Likewise. * testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc: Likewise. * testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc: Likewise. * testsuite/27_io/ios_base/sync_with_stdio/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/2.cc: Likewise. Check file positions. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc: Likewise. * testsuite/lib/libstdc++.exp (file-io-diff): New proc. --- .../27_io/basic_filebuf/close/char/1.cc | 6 ++-- .../basic_istream/extractors_other/char/2.cc | 9 ++++-- .../extractors_other/wchar_t/2.cc | 9 ++++-- .../27_io/basic_istream/get/char/2.cc | 8 +++-- .../27_io/basic_istream/get/wchar_t/2.cc | 8 +++-- .../27_io/basic_istream/ignore/char/3.cc | 8 +++-- .../27_io/basic_istream/ignore/wchar_t/3.cc | 8 +++-- .../27_io/basic_istream/peek/char/6414.cc | 9 ++++-- .../27_io/basic_istream/peek/wchar_t/6414.cc | 9 ++++-- .../27_io/basic_istream/seekg/char/fstream.cc | 10 ++++-- .../basic_istream/seekg/wchar_t/fstream.cc | 10 ++++-- .../27_io/basic_istream/tellg/char/fstream.cc | 10 ++++-- .../basic_istream/tellg/wchar_t/fstream.cc | 10 ++++-- .../27_io/basic_ofstream/open/char/1.cc | 5 ++- .../basic_ostream/inserters_other/char/1.cc | 8 +++-- .../basic_ostream/inserters_other/char/2.cc | 7 ++-- .../inserters_other/wchar_t/1.cc | 8 +++-- .../inserters_other/wchar_t/2.cc | 7 ++-- .../27_io/ios_base/sync_with_stdio/1.cc | 5 +-- libstdc++-v3/testsuite/lib/libstdc++.exp | 32 +++++++++++++++++++ 20 files changed, 130 insertions(+), 56 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc index e2b336a711d..d9e9c53e3e6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc @@ -15,14 +15,14 @@ // 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 // { dg-require-fileio "" } +// { dg-additional-files "filebuf_members-1.tst filebuf_members-1.txt" } +// { dg-final { file-io-diff "filebuf_members-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc index 589402308c3..77543310caa 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc @@ -17,11 +17,14 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.2.3 basic_istream::operator>> -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.2.3 basic_istream::operator>> // { dg-require-fileio "" } +// { dg-additional-files "istream_extractor_other-1.tst" } +// { dg-additional-files "istream_extractor_other-1.txt" } +// { dg-additional-files "istream_extractor_other-2.tst" } +// { dg-final { file-io-diff "istream_extractor_other-1" } } +// { dg-final { file-io-diff "istream_extractor_other-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc index b50dd26513a..82df1a17149 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc @@ -15,11 +15,14 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.2.3 basic_istream::operator>> -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.2.3 basic_istream::operator>> // { dg-require-fileio "" } +// { dg-additional-files "wistream_extractor_other-1.tst" } +// { dg-additional-files "wistream_extractor_other-1.txt" } +// { dg-additional-files "wistream_extractor_other-2.tst" } +// { dg-final { file-io-diff "wistream_extractor_other-1" } } +// { dg-final { file-io-diff "wistream_extractor_other-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc index cf646f379ef..95bad8badb9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc @@ -17,11 +17,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.tst" } +// { dg-additional-files "istream_unformatted-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "istream_unformatted-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc index 0ea162d8171..c155e402e2c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc @@ -15,11 +15,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.tst" } +// { dg-additional-files "istream_unformatted-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "istream_unformatted-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc index 222e450e9c8..acfafbcd83b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc @@ -17,11 +17,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.tst" } +// { dg-additional-files "istream_unformatted-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "istream_unformatted-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc index c9e942a712c..60c2655b606 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc @@ -15,11 +15,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.1.3 unformatted input functions // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.tst" } +// { dg-additional-files "istream_unformatted-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "istream_unformatted-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc index 0e0b44153a8..ffa0e88d8eb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc @@ -17,10 +17,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt + +// { dg-additional-files "istream_seeks-1.tst" } +// { dg-additional-files "istream_seeks-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "istream_seeks-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc index fbfbfbb2781..0d2172fe85d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc @@ -15,10 +15,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt + +// { dg-additional-files "wistream_seeks-1.tst" } +// { dg-additional-files "wistream_seeks-1.txt" } +// Reading the .txt file should not alter it: +// { dg-final { file-io-diff "wistream_seeks-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc index 0fa91a2716b..52401ca88fd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc @@ -17,12 +17,16 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "istream_seeks-1.tst" } +// { dg-additional-files "istream_seeks-1.txt" } +// { dg-additional-files "istream_seeks-2.tst" } +// Do not create istream_seeks-2.txt, we want it to be created as empty. +// { dg-final { file-io-diff "istream_seeks-1" } } +// { dg-final { file-io-diff "istream_seeks-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc index b792c8bc5cc..6dc69d57516 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc @@ -16,11 +16,15 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "wistream_seeks-1.tst" } +// { dg-additional-files "wistream_seeks-1.txt" } +// { dg-additional-files "wistream_seeks-2.tst" } +// Do not create wistream_seeks-2.txt, we want it to be created as empty. +// { dg-final { file-io-diff "wistream_seeks-1" } } +// { dg-final { file-io-diff "wistream_seeks-2" } } -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc index a1eabd6abb4..8ab130a0a71 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc @@ -17,12 +17,16 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt // { dg-require-fileio "" } +// { dg-additional-files "istream_seeks-1.tst" } +// { dg-additional-files "istream_seeks-1.txt" } +// { dg-additional-files "istream_seeks-2.tst" } +// Do not create istream_seeks-2.txt, we want it to be created as empty. +// { dg-final { file-io-diff "istream_seeks-1" } } +// { dg-final { file-io-diff "istream_seeks-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc index 636193af7e3..b22871f0d7d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc @@ -16,11 +16,15 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "wistream_seeks-1.tst" } +// { dg-additional-files "wistream_seeks-1.txt" } +// { dg-additional-files "wistream_seeks-2.tst" } +// Do not create wistream_seeks-2.txt, we want it to be created as empty. +// { dg-final { file-io-diff "wistream_seeks-1" } } +// { dg-final { file-io-diff "wistream_seeks-2" } } -// 27.6.1.3 unformatted input functions +// C++98 27.6.1.3 unformatted input functions // NB: ostream has a particular "seeks" category. Adopt this for istreams too. -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc index 45227107cbd..a9086a595cb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc @@ -17,10 +17,9 @@ // C++98 27.8.1.10 ofstream member functions -// { dg-additional-files "ofstream_members-1.tst" } -// @diff@ %-*.tst %-*.txt - // { dg-require-fileio "" } +// { dg-additional-files "ofstream_members-1.tst" } +// { dg-final { file-io-diff "ofstream_members-1" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc index 6d30d0ce94f..86a0ee8e77d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc @@ -18,11 +18,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.2.5.4 basic_ostream character inserters -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.2.5.3 basic_ostream inserters // { dg-require-fileio "" } +// { dg-additional-files "ostream_inserter_other-1.tst" } +// { dg-additional-files "ostream_inserter_other-2.tst" } +// { dg-final { file-io-diff "ostream_inserter_other-1" } } +// { dg-final { file-io-diff "ostream_inserter_other-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc index 15f0d5f7b0b..735f2e20e9c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc @@ -18,9 +18,9 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.2.5.4 basic_ostream character inserters -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.2.5.3 basic_ostream inserters + +// { dg-final { file-io-diff "ostream_inserter_other_in" "ostream_inserter_other_out" } } #include #include @@ -56,6 +56,7 @@ test03(void) out.seekp(0, ios_base::end); i_read = in.tellg() - rs; i_wrote = out.tellp() - ws; + VERIFY( i_read == i_wrote ); in.close(); out.close(); } diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc index 7692637e16d..1aecfa4f0e9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc @@ -15,11 +15,13 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.2.5.4 basic_ostream character inserters -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.2.5.3 basic_ostream inserters // { dg-require-fileio "" } +// { dg-additional-files "wostream_inserter_other-1.tst" } +// { dg-additional-files "wostream_inserter_other-2.tst" } +// { dg-final { file-io-diff "wostream_inserter_other-1" } } +// { dg-final { file-io-diff "wostream_inserter_other-2" } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc index 856af56011a..663539a5b19 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc @@ -15,9 +15,9 @@ // with this library; see the file COPYING3. If not see // . -// 27.6.2.5.4 basic_ostream character inserters -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt +// C++98 27.6.2.5.3 basic_ostream inserters + +// { dg-final { file-io-diff "wostream_inserter_other_in.txt" "wostream_inserter_other_out.txt" } } #include #include @@ -53,6 +53,7 @@ test03(void) out.seekp(0, ios_base::end); i_read = in.tellg() - rs; i_wrote = out.tellp() - ws; + VERIFY( i_read == i_wrote ); in.close(); out.close(); } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc index 4f9f7c3e554..20cbc1e08cd 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc @@ -20,8 +20,9 @@ // . // 27.4.2.4 ios_base static members -// @require@ %-*.tst -// @diff@ %-*.tst %-*.txt + +// { dg-additional-files "ios_base_members_static-1.tst" } +// { dg-final { file-io-diff "ios_base_members_static-1" } } #include #include diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 8efc6f7f089..ef511949c7b 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1674,3 +1674,35 @@ if { [info exists env(GCC_RUNTEST_PARALLELIZE_DIR)] \ } } + +# Compare output file written by test to expected result. +# With two arguments the comparison is done via 'diff arg1 arg2'. +# With one argument the comparison is done via 'diff arg1.tst arg1.txt'. +proc file-io-diff { args } { + set nargs [llength $args] + if { $nargs < 1 } { + error "too few arguments to file-io-diff" + } + if { $nargs > 2 } { + error "too many arguments to file-io-diff" + } + if { $nargs == 1 } { + set file1 [lindex $args 0] + set file2 "${file1}.txt" + append file1 ".tst" + } else { + set file1 [lindex $args 0] + set file2 [lindex $args 1] + } + + spawn -noecho diff -u $file1 $file2 + expect { + -re ".+" { + set msg "files differ\n" + append msg $expect_out(0,string) + fail $msg + exp_continue + } + } + return +} From patchwork Mon Jul 22 16:28:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963336 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=JreEna/N; 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 4WSQnv4HGbz1yZ7 for ; Tue, 23 Jul 2024 02:33:39 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B1B0E385840A for ; Mon, 22 Jul 2024 16:33:37 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 1A886385C6C6 for ; Mon, 22 Jul 2024 16:30:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A886385C6C6 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 1A886385C6C6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665870; cv=none; b=KUtM1LF53XBaKdTHIWXf7j3sJ7XzBZPdT6M2G/kLIqtV/rdw/7oEWbgklYNL63Hx55+XjfGqe4qT8Ntj3SjZp4ov0gQYsQ5f58EjBeMGpg3J068K7kJbW6E+5LQNaXkb7NmZVavoHtdx+WNDy6dC+ztvTO57cmjo0sMyDTrWp6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665870; c=relaxed/simple; bh=8DWFhQ+MTN8//7kdmx7yA4F6mQ5Scd5R+qnr5l1yJ7c=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vZavk7yZvW0aYB1TFuHrt2WiEsJJC4rrUXk3UbD5F4tJQF8eicb56cUM8qH/l7byqkH/2irGe1AsmWceBYxQ249u96a4LSwRvaGiTZzD8VkomNAebFCz9uFvnnsPXJpH4TAGpW/2IP2Rfq1Ek3R6V9H0kC6P4UG8EsQAbbQLbTQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665828; 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: in-reply-to:in-reply-to:references:references; bh=cuYTNCI24XD+mUJ0taSxhhuJA3mv2B0MxWGHaDpv8+0=; b=JreEna/NccmTZCbyxBg4QebVL25hVd9/E6634PVAoHwRplMEpXkChRi8g+IVxJ6vs0wUPM yKd0iIlrgp6QdnL/J66zRa8QVK1r7mYg2LnoXGnC8WWn4Zy6T14OZx1nyTP5E7pGofDSru XPOJODoEP2DzOzGERRotXSabx1nA6x0= Received: from mx-prod-mc-02.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-443-LN2NDTvJPOKSKci1ZUm4Fg-1; Mon, 22 Jul 2024 12:30:25 -0400 X-MC-Unique: LN2NDTvJPOKSKci1ZUm4Fg-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DB32F1955D55; Mon, 22 Jul 2024 16:30:23 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 14ADC3000194; Mon, 22 Jul 2024 16:30:22 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 5/8] libstdc++: Use dg-additional-files in some algorithm tests Date: Mon, 22 Jul 2024 17:28:39 +0100 Message-ID: <20240722163010.3508334-5-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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_H3, RCVD_IN_MSPIKE_WL, 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.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 -- Use the dg-additional-files directive to declare files that need to be copied into the test's working directory. This is currently redundant (as all .tst and .txt files are copied for all tests) but is a step towards not copying all files. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/advance/istreambuf_iterators/char/2.cc: Use dg-additional-files. * testsuite/25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc: Likewise. * testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: Likewise. * testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: Likewise. * testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc: Likewise. * testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc: Likewise. * testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: Likewise. * testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: Likewise. --- .../25_algorithms/advance/istreambuf_iterators/char/2.cc | 1 + .../25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc | 1 + .../testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc | 1 + .../25_algorithms/copy/streambuf_iterators/wchar_t/4.cc | 1 + .../testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc | 1 + .../testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc | 1 + .../testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc | 1 + .../25_algorithms/find/istreambuf_iterators/wchar_t/2.cc | 1 + 8 files changed, 8 insertions(+) diff --git a/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/2.cc b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/2.cc index 1a0635c0cca..c5414d4975d 100644 --- a/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/2.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc index 823e275da19..c2fd748cbf0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/wchar_t/2.cc @@ -16,6 +16,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc index 67888797047..3d1c7c7595d 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc @@ -27,6 +27,7 @@ #include // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } // In the occasion of libstdc++/25482 void test01() diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc index e1adccfdd21..8d380052313 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } #include #include diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc index 5179d78b455..a437bedb420 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } // Copyright (C) 2020-2024 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc index 14f58998fef..1353282f6a0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } // Copyright (C) 2020-2024 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc index 2a33bbaac9f..7a682edff7c 100644 --- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc @@ -23,6 +23,7 @@ #include // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } // In the occasion of libstdc++/25482 void test01() diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc index dfe5926c18a..c3187d17639 100644 --- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc @@ -18,6 +18,7 @@ // . // { dg-require-fileio "" } +// { dg-additional-files "istream_unformatted-1.txt" } #include #include From patchwork Mon Jul 22 16:28:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963333 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=Y5W+pwAS; 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 4WSQm75qXlz20Dw for ; Tue, 23 Jul 2024 02:32:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D0273861004 for ; Mon, 22 Jul 2024 16:32:06 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 63FFA385DDCA for ; Mon, 22 Jul 2024 16:30:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 63FFA385DDCA 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 63FFA385DDCA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; cv=none; b=G0vs4PY/TzwKgfM7YHSDTY//saEaidnjKf4/9bWmfNF7Mm7nywHmICyKmAYocCUqNQjojlXOjOa6NjCX6BXt10LXyguLeSqlOFfk+AZjYZU9GX7sVzFAZgjTQFMXxOb6Zm3GoVE+HwnvWmQ4ArcKnVUX/T5y2nzm2NelBGppjJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; c=relaxed/simple; bh=Jqz3qeO5c+OVj3LQ0ksjaGUkYCvNCIu81RKalZLsTd8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=aMEBxz0sFuuqsEaFyXMj7dfGNzpKJctsiE0XMd6bOUjQYEErydpfrLWYa9KKnajdK0sDIkTURtNnI2DBPnENMvGcklbz6FtmN+wNAznuEb9QEZrxqi1AXdjLjOCWOJFkCzkKdYJazhM4oXQuMVU8mqnzxGBcHEbEhyEWLkOocbU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665830; 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: in-reply-to:in-reply-to:references:references; bh=PQ7E/HZdeVG+9QmqkF/rRXn26fMF7xK+C63Hr5/8KtM=; b=Y5W+pwASt+X4IuNF921FdaDTOktwgVEsdL3VdOYASCQ/Sd5CvJ+3+QGFrAxldmt9VeCaTv xEQmwl1PPWAif7RaR2KwgmECHsyyvHTEp+EbNhP7APmW5DDut90juw37Y9ICRUL07dgp3+ hvN9pdRDXeB3//LwpH625vQAAIHzwlo= Received: from mx-prod-mc-01.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-29-Adi3Xl5ZOZiq5iBp2751lg-1; Mon, 22 Jul 2024 12:30:26 -0400 X-MC-Unique: Adi3Xl5ZOZiq5iBp2751lg-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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 08F36195421D; Mon, 22 Jul 2024 16:30:26 +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 52B6F195605F; Mon, 22 Jul 2024 16:30:25 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 6/8] libstdc++: Use dg-additional-files in some non-I/O tests Date: Mon, 22 Jul 2024 17:28:40 +0100 Message-ID: <20240722163010.3508334-6-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <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_H3, 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 -- libstdc++-v3/ChangeLog: * testsuite/20_util/hash/chi2_q_document_words.cc: Use dg-additional-files for input text. * testsuite/performance/ext/pb_ds/all_text_find.cc: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_find.hpp: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_insert.hpp: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_join.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_push.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc: Likewise. * testsuite/performance/ext/pb_ds/tree_text_insert.cc: Likewise. * testsuite/performance/ext/pb_ds/tree_text_lor_find.cc: Likewise. --- libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc | 2 ++ libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc | 2 ++ .../testsuite/performance/ext/pb_ds/multimap_text_find.hpp | 2 ++ .../testsuite/performance/ext/pb_ds/multimap_text_insert.hpp | 2 ++ .../performance/ext/pb_ds/multimap_text_insert_mem.hpp | 2 ++ .../testsuite/performance/ext/pb_ds/priority_queue_text_join.cc | 2 ++ .../performance/ext/pb_ds/priority_queue_text_modify.hpp | 2 ++ .../performance/ext/pb_ds/priority_queue_text_pop_mem.cc | 2 ++ .../testsuite/performance/ext/pb_ds/priority_queue_text_push.cc | 2 ++ .../performance/ext/pb_ds/priority_queue_text_push_pop.cc | 2 ++ .../testsuite/performance/ext/pb_ds/tree_text_insert.cc | 2 ++ .../testsuite/performance/ext/pb_ds/tree_text_lor_find.cc | 2 ++ 12 files changed, 24 insertions(+) diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc index a6ebc0011eb..3c77527c27c 100644 --- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc +++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc @@ -19,6 +19,8 @@ // along with this library; see the file COPYING3. If not see // . +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + #include "chi2_quality.h" // Tests chi^2 for a set of words taken from a document written in English. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc index 13c73a76647..df822c3d5f7 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file text_find_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp index 18e383ea17c..dbaaf04a1b6 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_find_timing_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp index 737be39a154..2c86b52f30a 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_insert_timing_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp index 9ce235381bd..ab755312c69 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_insert_mem_usage_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc index a515eea8009..aee52539fce 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_join_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp index cb62b616105..108b67284c3 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_modify_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc index 0a1003fe0f5..862de9858f9 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_pop_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc index 5a25a9a1925..4ba1fa3174a 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc index 4013cd28be0..0a1280962ec 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_pop_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc index 760006ec5ca..f439cad0c4e 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file tree_text_insert_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc index 53ed5538101..04dabccf74e 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file tree_text_lor_find_timing_test.cpp * Contains test for finding text with locality of reference. From patchwork Mon Jul 22 16:28:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963338 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=QhQJuLw+; 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 4WSQq40w7Vz1yZ7 for ; Tue, 23 Jul 2024 02:34:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 597D33861038 for ; Mon, 22 Jul 2024 16:34:38 +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 E5EFF385DDC0 for ; Mon, 22 Jul 2024 16:30:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E5EFF385DDC0 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 E5EFF385DDC0 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=1721665874; cv=none; b=JIxOhd99VB/IKQb427vEjK2AXnqvBdl5hpXTHTIvp3uDvRu91qbfckUzk937b9HTm8OocHmszXm/u0mp9j+sPcZLvJG4gywVb6xoKI+f+g9hRhzT2jm5C+Clq2VkmpZiJmw9u5ed5nX88MGPRFRSQwUS6LQ1Mr2bwT805ZTM6Sg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665874; c=relaxed/simple; bh=ap3cK+1BBh8TEktNUkyYC+fqX4rhZ6FSLoUViOLGVm4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=L1YqimawRNwJtTYJB77B02KxL++TO7543Po1CKRozmWl0Nz7ZWCNvg0Ap/Y9s8SQDqjjZKoTIDTS4K1CNwK1FemPiM+x3srKD1LRyUpgRrfVDei21qzrs8Mgd6jP8h3ySkr0V0+HWMVcIk2qkpLubw1lk+8TavpLkSd/DY1vxyI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665831; 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: in-reply-to:in-reply-to:references:references; bh=xAdlSah70oD9TpECGSiXmj6b6GHmxafJSf0Ri406iqI=; b=QhQJuLw+3vYD72a2O19FcnixhXJ3Lz/lo5YJKeVRGQhLc9GYGk85nBLk5Pk2WX3j9mqLNY y63kMhU1TXc//CRNk5ZTWODyvnjjLsbVmjcMNu8889ly5WOYxNXZY0bORfMkKgXItFKMP4 eV3VgGkZSN2C6CkH22y9NVl8TG2X2A0= Received: from mx-prod-mc-05.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-258-tbHHkeALOQGokl_VkfI1Ew-1; Mon, 22 Jul 2024 12:30:29 -0400 X-MC-Unique: tbHHkeALOQGokl_VkfI1Ew-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14943195608A; Mon, 22 Jul 2024 16:30:28 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6211F19560B2; Mon, 22 Jul 2024 16:30:27 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 7/8] libstdc++: Stop copying all data files into test directory Date: Mon, 22 Jul 2024 17:28:41 +0100 Message-ID: <20240722163010.3508334-7-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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.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 -- This removes the TODO in libstdc++_init, so that we don't copy all *.tst and *.txt files from testsuite/data into every test's working directory. Instead, only the necessary files declared with dg-additional-files are copied. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (libstdc++_init): Do not copy all data files into test directory. --- libstdc++-v3/testsuite/lib/libstdc++.exp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index ef511949c7b..4bf88e72d05 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -158,11 +158,6 @@ proc libstdc++_init { testfile } { global dg-do-what-default set dg-do-what-default run - # Copy all required data files. - # TODO: Use dg-additional-files in individual tests instead of doing this. - v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] - v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] - set ld_library_path_tmp "" # Locate libgcc.a so we don't need to account for different values of From patchwork Mon Jul 22 16:28:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963334 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=YqaF+3tm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WSQmk0lB6z1yZ7 for ; Tue, 23 Jul 2024 02:32:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EF84E3861030 for ; Mon, 22 Jul 2024 16:32:35 +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 F05B3385DDF7 for ; Mon, 22 Jul 2024 16:30:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F05B3385DDF7 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 F05B3385DDF7 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=1721665874; cv=none; b=hQqmrWlhxj15+y5wiEb/P7lvMIFHzMliLOKJWOzmRZ6mLtOBuCMkt//3qCJl+4MUwADDfCq0cHAGewP/dtNJ0A4WTUJECWnGEgSoWL4Y6586xAuJxxw0D3acuZJw6IlV8e22ApGPxx+wNLTkpubsW5kQw4icZp46OUjXuXXNDxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665874; c=relaxed/simple; bh=bSwkltu9k62Dv5YgKdTebLK3k2Et9z2YpLSzb077bcU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JxrpZYyMGMmROzAUva9xhrvnV9MJXh6wQ9nISlsvj1zzn633toaAZ/ejm/GB+jBdAbwsZ2awcpwg18P+0nANpaJf8qUDvzWMyFG51NW4CZw4INhk1EwlEMzam2uq+Sol+VU+Kcm+7IzE5u87i/mKJp+qCRtHJxEaDZMgNXBnTeE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665832; 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: in-reply-to:in-reply-to:references:references; bh=B51dT1hmnic9M4d9txfU/Wg9xV2mioekEo/IbK683is=; b=YqaF+3tmqnRrzniFDvZN4OcMKic3IiBHu7NTeoc9NSieVJmGg7WvrDzCu58+zvpmiEmk7i KTJ2cv05OS/YEYd03E4hWJDxb3bG/yMHcDtNX97u4lH8yuJ/eMgyANpHeru/Dg0UwtISfY 1YJfZzAHsmVe6uSDaM8NvMp5HHHor3Y= Received: from mx-prod-mc-03.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-402-rnewIfzwOgirVQVGEOi-pA-1; Mon, 22 Jul 2024 12:30:31 -0400 X-MC-Unique: rnewIfzwOgirVQVGEOi-pA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 43E4419560AB; Mon, 22 Jul 2024 16:30:30 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 83BBE1955D45; Mon, 22 Jul 2024 16:30:29 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 8/8] libstdc++: Rename tests [PR12048] Date: Mon, 22 Jul 2024 17:28:42 +0100 Message-ID: <20240722163010.3508334-8-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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, 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 -- These have the wrong PR number in the filenames. libstdc++-v3/ChangeLog: PR libstdc++/12048 * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc: Move to... * testsuite/ext/stdio_sync_filebuf/wchar_t/12048-1.cc: ...here. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc: Move to... * testsuite/ext/stdio_sync_filebuf/wchar_t/12048-2.cc: ...here. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc: Move to... * testsuite/ext/stdio_sync_filebuf/wchar_t/12048-3.cc: ...here. * testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc: Move to... * testsuite/ext/stdio_sync_filebuf/wchar_t/12048-4.cc: ...here. --- .../ext/stdio_sync_filebuf/wchar_t/{12948-1.cc => 12048-1.cc} | 0 .../ext/stdio_sync_filebuf/wchar_t/{12948-2.cc => 12048-2.cc} | 0 .../ext/stdio_sync_filebuf/wchar_t/{12948-3.cc => 12048-3.cc} | 0 .../ext/stdio_sync_filebuf/wchar_t/{12948-4.cc => 12048-4.cc} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/{12948-1.cc => 12048-1.cc} (100%) rename libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/{12948-2.cc => 12048-2.cc} (100%) rename libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/{12948-3.cc => 12048-3.cc} (100%) rename libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/{12948-4.cc => 12048-4.cc} (100%) diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-1.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc rename to libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-1.cc diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-2.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc rename to libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-2.cc diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-3.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc rename to libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-3.cc diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-4.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc rename to libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12048-4.cc