From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 33C713941C62; Sun, 12 Jul 2020 18:29:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33C713941C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1594578599; bh=KNwOIJt/mJKfIQiaT+PZWscML+CiIbzM72S6/eDyP4s=; h=From:To:Subject:Date:From; b=Eoc/+p/eQhl+U5wG36RZ0MaCJiKYzesbgEvibZ/LEz0XxG0nobZInjNb60ktajbAZ oddEY64A7+dvOAANiUhvo2d/5palHZu+C63gK37RRCD6F1VA195fHjJ6SYpiU0CkHz ajBljxB21px5ub5IeLZaEJnSKJTEYfxcP5hz6dLE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/gccgo] libstdc++: Enable simple invocation of runtest in testsuite X-Act-Checkin: gcc X-Git-Author: Matthias Kretz X-Git-Refname: refs/heads/devel/gccgo X-Git-Oldrev: f65a3299a521a44522c1e01724f75e36af22f40b X-Git-Newrev: bc7a4f2f9e91b3a08eff2eba759f071127f714cd Message-Id: <20200712182959.33C713941C62@sourceware.org> Date: Sun, 12 Jul 2020 18:29:59 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jul 2020 18:29:59 -0000 https://gcc.gnu.org/g:bc7a4f2f9e91b3a08eff2eba759f071127f714cd commit bc7a4f2f9e91b3a08eff2eba759f071127f714cd Author: Matthias Kretz Date: Thu May 21 13:22:48 2020 +0100 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 Diff: --- 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