From 5ec501b5749c1df79b749a7fd885760dc734b31c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 16 Nov 2021 19:23:58 -0500
Subject: [PATCH] sim: testsuite: add more silent build rules

site.exp is still verbose, but that comes from automake, so have
to get it fixed upstream.
---
 sim/Makefile.in        | 10 ++++++++--
 sim/testsuite/local.mk | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 07c89377e97..d33720b6bb8 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -1257,6 +1257,12 @@ common_libcommon_a_SOURCES = \
 
 # Tweak the site.exp so it works with plain `runtest` from user.
 EXTRA_DEJAGNU_SITE_CONFIG = site-srcdir.exp
+
+# Custom verbose test variables that automake doesn't provide (yet?).
+AM_V_RUNTEST = $(AM_V_RUNTEST_@AM_V@)
+AM_V_RUNTEST_ = $(AM_V_RUNTEST_@AM_DEFAULT_V@)
+AM_V_RUNTEST_0 = @echo "  RUNTEST  $(RUNTESTFLAGS)";
+AM_V_RUNTEST_1 = 
 testsuite_common_CPPFLAGS = \
 	-I$(srcdir)/common \
 	-I$(srcroot)/include \
@@ -2429,10 +2435,10 @@ common/version.c-stamp: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(src
 @SIM_ENABLE_IGEN_TRUE@	$(AM_V_CC)$(COMPILE_FOR_BUILD) -DMAIN -c $< -o $@
 
 site-srcdir.exp: Makefile
-	echo "set srcdir \"$(srcdir)/testsuite\"" > $@
+	$(AM_V_GEN)echo "set srcdir \"$(srcdir)/testsuite\"" > $@
 
 check-DEJAGNU: site.exp
-	LC_ALL=C; export LC_ALL; \
+	$(AM_V_RUNTEST)LC_ALL=C; export LC_ALL; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	runtest=$(RUNTEST); \
 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk
index 82eb70de72a..4da63ea49fa 100644
--- a/sim/testsuite/local.mk
+++ b/sim/testsuite/local.mk
@@ -18,11 +18,17 @@
 # Tweak the site.exp so it works with plain `runtest` from user.
 EXTRA_DEJAGNU_SITE_CONFIG = site-srcdir.exp
 
+# Custom verbose test variables that automake doesn't provide (yet?).
+AM_V_RUNTEST = $(AM_V_RUNTEST_@AM_V@)
+AM_V_RUNTEST_ = $(AM_V_RUNTEST_@AM_DEFAULT_V@)
+AM_V_RUNTEST_0 =  @echo "  RUNTEST  $(RUNTESTFLAGS)";
+AM_V_RUNTEST_1 =
+
 site-srcdir.exp: Makefile
-	echo "set srcdir \"$(srcdir)/testsuite\"" > $@
+	$(AM_V_GEN)echo "set srcdir \"$(srcdir)/testsuite\"" > $@
 
 check-DEJAGNU: site.exp
-	LC_ALL=C; export LC_ALL; \
+	$(AM_V_RUNTEST)LC_ALL=C; export LC_ALL; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	runtest=$(RUNTEST); \
 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
-- 
2.30.2