diff options
| author | Tom Tromey <tromey@adacore.com> | 2021-06-01 08:11:30 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2021-06-01 08:11:30 -0600 |
| commit | f99d1d37496f3af263e0761c2fd330e62599f383 (patch) | |
| tree | 6d2c707eeb75b85b7b7d99e3663a57e492cdda74 /gdb/testsuite/Makefile.in | |
| parent | 17d305ef8f4b5bf20beaaad427490b3c6773909b (diff) | |
| download | gdb-f99d1d37496f3af263e0761c2fd330e62599f383.zip gdb-f99d1d37496f3af263e0761c2fd330e62599f383.tar.gz gdb-f99d1d37496f3af263e0761c2fd330e62599f383.tar.bz2 | |
Remove gdb/testsuite/configure
I didn't see a strong reason to have a separate configure script in
gdb/testsuite, so this patch removes it. The few relevant configury
bits are moved into gdb's configure script. Some of the old
testsuite/configure script (e.g., the header check) is dead code.
This also adds a Makefile rule to rebuild lib/pdtrace. This was
missing from the old code.
'read1' is now a dependency of check-read1, rather than extra code at
configure time.
Finally, the old "ENABLE_LIBCTF" subst in gdb/configure was not used;
nor was the variable defined, so this was always empty. However, the
lower-case variant was used by the testsuite, so this patch renames
the subst.
gdb/ChangeLog
2021-06-01 Tom Tromey <tromey@adacore.com>
* configure.ac: Copy some code from testsuite/configure.ac.
(enable_libctf): Subst this, not ENABLE_LIBCTF.
* configure: Rebuild.
gdb/testsuite/ChangeLog
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
config.status.
(distclean maintainer-clean realclean, Makefile): Update.
(config.status): Remove target.
(lib/pdtrace): New target.
(all): Don't depend on EXTRA_RULES.
(check-read1): Depend on read1.so, expect-read1.
Diffstat (limited to 'gdb/testsuite/Makefile.in')
| -rw-r--r-- | gdb/testsuite/Makefile.in | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index e33a7c0..e44d44e 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -35,8 +35,6 @@ EXEEXT = @EXEEXT@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ -EXTRA_RULES = @EXTRA_RULES@ - CC=@CC@ EXPECT = `if [ "$${READ1}" != "" ] ; then \ @@ -97,7 +95,7 @@ TARGET_FLAGS_TO_PASS = \ "RUNTEST=$(RUNTEST)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" -all: $(EXTRA_RULES) +all: @echo "Nothing to be done for all..." .NOEXPORT: @@ -118,7 +116,7 @@ uninstall: force # Bare `site.exp' is used as a target here if user requests it explicitly. # $(RUNTEST) is looking up `site.exp' only in the current directory. -$(abs_builddir)/site.exp site.exp: ./config.status Makefile +$(abs_builddir)/site.exp site.exp: Makefile @echo "Making a new config file..." -@rm -f ./tmp? @touch site.exp @@ -160,7 +158,7 @@ CHECK_TARGET = $(if $(RACY_ITER),$(addsuffix -racy,$(CHECK_TARGET_TMP)),$(CHECK_ check: all $(abs_builddir)/site.exp $(MAKE) $(CHECK_TARGET) -check-read1: +check-read1: read1.so expect-read1 $(MAKE) READ1="1" check # Check whether we need to print the timestamp for each line of @@ -350,14 +348,14 @@ clean mostlyclean: distclean maintainer-clean realclean: clean -rm -f *~ core - -rm -f Makefile config.status *-init.exp + -rm -f Makefile *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* -Makefile : Makefile.in config.status $(host_makefile_frag) - $(SHELL) config.status +Makefile : Makefile.in ../config.status $(host_makefile_frag) + cd .. && $(SHELL) ./config.status testsuite/Makefile -config.status: configure - $(SHELL) config.status --recheck +lib/pdtrace: pdtrace.in ../config.status + cd .. && $(SHELL) ./config.status testsuite/lib/pdtrace TAGS: force find $(srcdir) -name '*.exp' -print | \ |