On Mon, Jul 22, 2024 at 9:35 AM Jonathan Wakely <jwak...@redhat.com> wrote:
>
> 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.
Note one of these patches in this set broke testing in some cases.
The reason is that v3_additional_files will be " file1 file2" and
calling split on it, there will be an empty filename for the first
entry.
I have a patch which calls "string trim" on v3_additional_files before
calling split and that seems to fix the problem. I will post it once
my testsuite run is done.
Thanks,
Andrew Pinski
>
> 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
> --
> 2.45.2
>
