diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-11-09 17:57:34 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-11-09 17:57:34 +0000 |
| commit | b8b4e42bdeee63d803eca3e1194a7fa785a4df73 (patch) | |
| tree | 6baad4bb04a48f268f16ab86161ec4d72f5d8bd9 | |
| parent | 88ee28e9fa956397af85031dfb1cad2c5a92844d (diff) | |
| download | gdb-b8b4e42bdeee63d803eca3e1194a7fa785a4df73.zip gdb-b8b4e42bdeee63d803eca3e1194a7fa785a4df73.tar.gz gdb-b8b4e42bdeee63d803eca3e1194a7fa785a4df73.tar.bz2 | |
gdb/testsuite/
* Makefile.in (abs_builddir): New.
(site.exp): New target `$(abs_builddir)/site.exp'. New comment.
(check-single, $(TEST_TARGETS), check-gdb.base%): Change `site.exp' to
`$(abs_builddir)/site.exp'.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/Makefile.in | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8cb5882..195ed42 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-11-09 Jan Kratochvil <jan.kratochvil@redhat.com> + + * Makefile.in (abs_builddir): New. + (site.exp): New target `$(abs_builddir)/site.exp'. New comment. + (check-single, $(TEST_TARGETS), check-gdb.base%): Change `site.exp' to + `$(abs_builddir)/site.exp'. + 2009-11-05 Daniel Jacobowitz <dan@codesourcery.com> * config/m68k-emc.exp, lib/emc-support.exp, diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 7e750c5..c6ef5f9 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -22,6 +22,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +abs_builddir = @abs_builddir@ target_alias = @target_noncanonical@ program_transform_name = @program_transform_name@ @@ -102,7 +103,11 @@ install: uninstall: force -site.exp: ./config.status Makefile +# Use absolute `site.exp' path everywhere to suppress VPATH lookups for it. +# 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 @echo "Making a new config file..." -@rm -f ./tmp? @touch site.exp @@ -147,7 +152,7 @@ DO_RUNTEST = \ export TCL_LIBRARY ; fi ; \ $(RUNTEST) -check-single: all site.exp +check-single: all $(abs_builddir)/site.exp $(DO_RUNTEST) $(RUNTESTFLAGS) # A list of all directories named "gdb.*" which also hold a .exp file. @@ -170,7 +175,7 @@ check-parallel: $(SHELL) $(srcdir)/dg-extract-results.sh -L \ $(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log -$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all site.exp +$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all $(abs_builddir)/site.exp @if test ! -d gdb.$*; then mkdir gdb.$*; fi $(DO_RUNTEST) --directory=gdb.$* --outdir=gdb.$* $(RUNTESTFLAGS) @@ -179,7 +184,7 @@ BASE1_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[a-m]*.exp) BASE2_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[n-z]*.exp)) # Handle each half of gdb.base. -check-gdb.base%: all site.exp +check-gdb.base%: all $(abs_builddir)/site.exp @if test ! -d gdb.base$*; then mkdir gdb.base$*; fi $(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTESTFLAGS) |