From bc7a4f2f9e91b3a08eff2eba759f071127f714cd Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Thu, 21 May 2020 13:22:48 +0100 Subject: [PATCH] libstdc++: Enable simple invocation of runtest in testsuite 2020-05-21 Matthias Kretz * testsuite/Makefile.am: Remove dup target_triplet and set tool, allowing runtest to work without arguments. * testsuite/Makefile.in: Regenerate. Signed-off-by: Jonathan Wakely --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/Makefile.am | 2 +- libstdc++-v3/testsuite/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 95c15977796..d19cd51db35 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2020-05-21 Matthias Kretz + + * testsuite/Makefile.am: Remove dup target_triplet and set tool, + allowing runtest to work without arguments. + * testsuite/Makefile.in: Regenerate. + 2020-05-21 Jonathan Wakely PR libstdc++/93983 diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index e19509d2534..9cef1e65e1b 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -47,6 +47,7 @@ site.exp: Makefile @echo '## these variables are automatically generated by make ##' >site.tmp @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp + @echo 'set tool libstdc++' >>site.tmp @echo 'set srcdir $(srcdir)' >>site.tmp @echo "set objdir `pwd`" >>site.tmp @echo 'set build_alias "$(build_alias)"' >>site.tmp @@ -55,7 +56,6 @@ site.exp: Makefile @echo 'set host_triplet $(host_triplet)' >>site.tmp @echo 'set target_alias "$(target_alias)"' >>site.tmp @echo 'set target_triplet $(target_triplet)' >>site.tmp - @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set libiconv "$(LIBICONV)"' >>site.tmp @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp @echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 2c248cf6302..e2bf241e756 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -597,6 +597,7 @@ site.exp: Makefile @echo '## these variables are automatically generated by make ##' >site.tmp @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp + @echo 'set tool libstdc++' >>site.tmp @echo 'set srcdir $(srcdir)' >>site.tmp @echo "set objdir `pwd`" >>site.tmp @echo 'set build_alias "$(build_alias)"' >>site.tmp @@ -605,7 +606,6 @@ site.exp: Makefile @echo 'set host_triplet $(host_triplet)' >>site.tmp @echo 'set target_alias "$(target_alias)"' >>site.tmp @echo 'set target_triplet $(target_triplet)' >>site.tmp - @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set libiconv "$(LIBICONV)"' >>site.tmp @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp @echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp -- 2.30.2