[3/5] Apply silent Makefile rules to gdb/testsuite

Message ID 20210528192743.508390-4-tromey@adacore.com
State New
Headers show
Series
  • Some gdb build cleanups
Related show

Commit Message

Tom Tromey May 28, 2021, 7:27 p.m.
This applies the silent-rules.mk treatment to gdb/testsuite/Makefile.

2021-05-28  Tom Tromey  <tromey@adacore.com>

	* silent-rules.mk (ECHO_CC): New variable.

gdb/testsuite/ChangeLog
2021-05-28  Tom Tromey  <tromey@adacore.com>

	* Makefile.in (all): Don't print anything.
	($(abs_builddir)/site.exp site.exp): Use $(ECHO_GEN).
	(expect-read1): Likewise.
	(read1.so): Use $(ECHO_CC).
	Include silent-rules.mk.
---
 gdb/ChangeLog             |  4 +++
 gdb/silent-rules.mk       |  1 +
 gdb/testsuite/ChangeLog   |  8 +++++
 gdb/testsuite/Makefile.in | 67 ++++++++++++++++++++-------------------
 4 files changed, 47 insertions(+), 33 deletions(-)

-- 
2.26.3

Patch

diff --git a/gdb/silent-rules.mk b/gdb/silent-rules.mk
index f7b959f8390..772bd6728be 100644
--- a/gdb/silent-rules.mk
+++ b/gdb/silent-rules.mk
@@ -2,6 +2,7 @@ 
 V ?= 0
 ifeq ($(V),0)
 ECHO_CXX =    @echo "  CXX    $@";
+ECHO_CC  =    @echo "  CC     $@";
 ECHO_CXXLD =  @echo "  CXXLD  $@";
 ECHO_REGDAT = @echo "  REGDAT $@";
 ECHO_GEN =    @echo "  GEN    $@";
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index e4be859e5ad..05ecb185a35 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -104,7 +104,7 @@  TARGET_FLAGS_TO_PASS = \
         "RUNTESTFLAGS=$(RUNTESTFLAGS)"
 
 all: $(EXTRA_RULES)
-	@echo "Nothing to be done for all..."
+	@:
 
 .NOEXPORT:
 INFODIRS=doc
@@ -125,26 +125,26 @@  uninstall: force
 # $(RUNTEST) is looking up `site.exp' only in the current directory.
 
 $(abs_builddir)/site.exp site.exp: Makefile
-	@echo "Making a new config file..."
-	-@rm -f ./tmp?
-	@touch site.exp
-	-@mv site.exp site.bak
-	@echo "## these variables are automatically generated by make ##" > ./tmp0
-	@echo "# Do not edit here. If you wish to override these values" >> ./tmp0
-	@echo "# add them to the last section" >> ./tmp0
-	@echo "set host_triplet ${host_canonical}" >> ./tmp0
-	@echo "set target_alias $(target_alias)" >> ./tmp0
-	@echo "set target_triplet ${target_canonical}" >> ./tmp0
-	@echo "set build_triplet ${build_canonical}" >> ./tmp0
-	@echo "set srcdir ${abs_srcdir}" >> ./tmp0
-	@echo "set tool gdb" >> ./tmp0
-	@echo "set enable_libctf ${enable_libctf}" >> ./tmp0
-	@echo 'source $${srcdir}/lib/append_gdb_boards_dir.exp' >> ./tmp0
-	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
-		@cat ./tmp0 > site.exp
-	@cat site.bak | sed \
-			-e '1,/^## All variables above are.*##/ d' >> site.exp
-	-@rm -f ./tmp?
+	$(ECHO_GEN) \
+	rm -f ./tmp?; \
+	touch site.exp; \
+	mv site.exp site.bak; \
+	echo "## these variables are automatically generated by make ##" > ./tmp0; \
+	echo "# Do not edit here. If you wish to override these values" >> ./tmp0; \
+	echo "# add them to the last section" >> ./tmp0; \
+	echo "set host_triplet ${host_canonical}" >> ./tmp0; \
+	echo "set target_alias $(target_alias)" >> ./tmp0; \
+	echo "set target_triplet ${target_canonical}" >> ./tmp0; \
+	echo "set build_triplet ${build_canonical}" >> ./tmp0; \
+	echo "set srcdir ${abs_srcdir}" >> ./tmp0; \
+	echo "set tool gdb" >> ./tmp0; \
+	echo "set enable_libctf ${enable_libctf}" >> ./tmp0; \
+	echo 'source $${srcdir}/lib/append_gdb_boards_dir.exp' >> ./tmp0; \
+	echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0; \
+	cat ./tmp0 > site.exp; \
+	cat site.bak | sed \
+			-e '1,/^## All variables above are.*##/ d' >> site.exp; \
+	rm -f ./tmp?
 
 installcheck:
 
@@ -373,23 +373,23 @@  TAGS: force
 
 # Build the expect wrapper script that preloads the read1.so library.
 expect-read1:
-	@echo Making expect-read1
-	@rm -f expect-read1-tmp
-	@touch expect-read1-tmp
-	@echo "# THIS FILE IS GENERATED -*- buffer-read-only: t -*- \n" >>expect-read1-tmp
-	@echo "# vi:set ro: */\n\n" >>expect-read1-tmp
-	@echo "# To regenerate this file, run:\n" >>expect-read1-tmp
-	@echo "#      make clean; make/\n" >>expect-read1-tmp
-	@echo "export LD_PRELOAD=`pwd`/read1.so" >>expect-read1-tmp
-	@echo 'exec expect "$$@"' >>expect-read1-tmp
-	@chmod +x expect-read1-tmp
-	@mv expect-read1-tmp expect-read1
+	$(ECHO_GEN) \
+	rm -f expect-read1-tmp; \
+	touch expect-read1-tmp; \
+	echo "# THIS FILE IS GENERATED -*- buffer-read-only: t -*- \n" >>expect-read1-tmp; \
+	echo "# vi:set ro: */\n\n" >>expect-read1-tmp; \
+	echo "# To regenerate this file, run:\n" >>expect-read1-tmp; \
+	echo "#      make clean; make/\n" >>expect-read1-tmp; \
+	echo "export LD_PRELOAD=`pwd`/read1.so" >>expect-read1-tmp; \
+	echo 'exec expect "$$@"' >>expect-read1-tmp; \
+	chmod +x expect-read1-tmp; \
+	mv expect-read1-tmp expect-read1
 
 # Build the read1.so preload library.  This overrides the `read'
 # function, making it read one byte at a time.  Running the testsuite
 # with this catches racy tests.
 read1.so: lib/read1.c
-	$(CC) -o $@ ${srcdir}/lib/read1.c -Wall -g -shared -fPIC $(CFLAGS)
+	$(ECHO_CC) $(CC) -o $@ ${srcdir}/lib/read1.c -Wall -g -shared -fPIC $(CFLAGS)
 
 # Build the read1 machinery.
 .PHONY: read1
@@ -397,3 +397,4 @@  read1: read1.so expect-read1
 
 # Disable implicit make rules.
 include $(srcdir)/../disable-implicit-rules.mk
+include $(srcdir)/../silent-rules.mk