summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2021-06-01 08:11:30 -0600
committerTom Tromey <tromey@adacore.com>2021-06-01 08:11:31 -0600
commit2adf17813913122c9ca53dde25cab8fde14483db (patch)
treef3a47e1b0d3b81f28f15bedb7ef3b7357dea4886
parentbdbbcd577460964c28e7e89593ec3ebbf6e9208b (diff)
downloadbinutils-gdb-2adf17813913122c9ca53dde25cab8fde14483db.tar.gz
Apply silent Makefile rules to gdb/testsuite
This applies the silent-rules.mk treatment to gdb/testsuite/Makefile. gdb/ChangeLog 2021-06-01 Tom Tromey <tromey@adacore.com> * silent-rules.mk (ECHO_CC): New variable. gdb/testsuite/ChangeLog 2021-06-01 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.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/silent-rules.mk1
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/Makefile.in67
4 files changed, 47 insertions, 33 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 506bccf2022..137919e4ffd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2021-06-01 Tom Tromey <tromey@adacore.com>
+ * silent-rules.mk (ECHO_CC): New variable.
+
+2021-06-01 Tom Tromey <tromey@adacore.com>
+
* Makefile.in (SUBDIRS): Add testsuite.
(all): Don't exclude testsuite.
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/ChangeLog b/gdb/testsuite/ChangeLog
index 60a8ca96b3b..016bb722037 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,13 @@
2021-06-01 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.
+
+2021-06-01 Tom Tromey <tromey@adacore.com>
+
* aclocal.m4, configure.ac, configure: Remove.
* Makefile.in (EXTRA_RULES): Remove.
($(abs_builddir)/site.exp site.exp): Don't depend on
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index e44d44edc3b..2c0482cef1b 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -96,7 +96,7 @@ TARGET_FLAGS_TO_PASS = \
"RUNTESTFLAGS=$(RUNTESTFLAGS)"
all:
- @echo "Nothing to be done for all..."
+ @:
.NOEXPORT:
INFODIRS=doc
@@ -117,26 +117,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:
@@ -365,23 +365,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
@@ -389,3 +389,4 @@ read1: read1.so expect-read1
# Disable implicit make rules.
include $(srcdir)/../disable-implicit-rules.mk
+include $(srcdir)/../silent-rules.mk