libstdc++: Enable simple invocation of runtest in testsuite

2020-05-21  Matthias Kretz  <kretz@kde.org>

	* 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 <jwakely@redhat.com>

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 95c15977796ce6053e8251dd036e5c88c0936685..d19cd51db352e189b53a5f6ed0872f9ec277e146 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-21  Matthias Kretz  <kretz@kde.org>
+
+       * 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  <jwakely@redhat.com>
 
        PR libstdc++/93983

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index e19509d2534aa49d509d4aa6d866382ecc913a60..9cef1e65e1b9649a190b17e88f1aa189ab14399e 100644 (file)
--- 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 2c248cf630299d86cddb76145808eb4b4f2a6f79..e2bf241e756c5d0fef3d7665e031ab4690ce30cc 100644 (file)
--- 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