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