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