X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftestsuite%2FMakefile.in;h=3ad5feb4e8a3b4df95dddb8a676fd3bee3dbe948;hb=7e0aa6aa9983c745aedc203db0cc360a0ad47cac;hp=5238cf078d36d1fd622dc693cd085c1e4b746d5d;hpb=4c38e0a4fcb69f8586d8db0b9cdb8dbab5980811;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 5238cf078d..3ad5feb4e8 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -1,6 +1,5 @@ # Makefile for regression testing the GNU debugger. -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002, 2003, 2004, -# 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. # This file is part of GDB. @@ -33,16 +32,24 @@ SHELL = @SHELL@ EXEEXT = @EXEEXT@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ -ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm \ - gdb.dwarf2 \ - gdb.fortran gdb.server gdb.java gdb.mi gdb.multi \ - gdb.objc gdb.opt gdb.pascal gdb.python gdb.threads gdb.trace \ - gdb.xml \ +ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.btrace gdb.cell gdb.cp \ + gdb.disasm gdb.dlang gdb.dwarf2 gdb.fortran gdb.gdb gdb.go \ + gdb.java gdb.linespec gdb.mi gdb.modula2 gdb.multi \ + gdb.objc gdb.opencl gdb.opt gdb.pascal gdb.python gdb.server \ + gdb.stabs gdb.reverse gdb.threads gdb.trace gdb.xml \ $(SUBDIRS) -EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \ - echo $${rootme}/../../expect/expect ; \ - else echo expect ; fi` +EXTRA_RULES = @EXTRA_RULES@ + +CC=@CC@ + +EXPECT = `if [ "$${READ1}" != "" ] ; then \ + echo $${rootme}/expect-read1; \ + elif [ -f $${rootme}/../../expect/expect ] ; then \ + echo $${rootme}/../../expect/expect ; \ + else \ + echo expect ; \ + fi` RUNTEST = $(RUNTEST_FOR_TARGET) @@ -85,7 +92,7 @@ TARGET_FLAGS_TO_PASS = \ "RUNTEST=$(RUNTEST)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" -all: +all: $(EXTRA_RULES) @echo "Nothing to be done for all..." .NOEXPORT: @@ -120,6 +127,7 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile @echo "set build_triplet ${build_canonical}" >> ./tmp0 @echo "set srcdir ${srcdir}" >> ./tmp0 @echo "set tool gdb" >> ./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 \ @@ -128,14 +136,26 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile installcheck: -# For GNU make, try to run the tests in parallel. If RUNTESTFLAGS is -# not empty, then by default the tests will be serialized. This can -# be overridden by setting FORCE_PARALLEL to any non-empty value. -# For a non-GNU make, do not parallelize. -@GMAKE_TRUE@CHECK_TARGET = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,check-parallel)) +# See whether -j was given to make. Either it was given with no +# arguments, and appears as "j" in the first word, or it was given an +# argument and appears as "-j" in a separate word. +@GMAKE_TRUE@saw_dash_j = $(or $(findstring j,$(firstword $(MAKEFLAGS))),$(filter -j,$(MAKEFLAGS))) + +# For GNU make, try to run the tests in parallel if any -j option is +# given. If RUNTESTFLAGS is not empty, then by default the tests will +# be serialized. This can be overridden by setting FORCE_PARALLEL to +# any non-empty value. For a non-GNU make, do not parallelize. +@GMAKE_TRUE@CHECK_TARGET = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,$(if $(saw_dash_j),check-parallel,check-single))) @GMAKE_FALSE@CHECK_TARGET = check-single -check: $(CHECK_TARGET) +# Note that we must resort to a recursive make invocation here, +# because GNU make 3.82 has a bug preventing MAKEFLAGS from being used +# in conditions. +check: all $(abs_builddir)/site.exp + $(MAKE) $(CHECK_TARGET) + +check-read1: + $(MAKE) READ1="1" check # All the hair to invoke dejagnu. A given invocation can just append # $(RUNTESTFLAGS) @@ -151,68 +171,114 @@ DO_RUNTEST = \ export TCL_LIBRARY ; fi ; \ $(RUNTEST) -check-single: all $(abs_builddir)/site.exp - $(DO_RUNTEST) $(RUNTESTFLAGS) - -# A list of all directories named "gdb.*" which also hold a .exp file. -# We filter out gdb.base and add fake entries, because that directory -# takes the longest to process, and so we split it in half. -TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(srcdir)/gdb.*/*.exp)))))) - -TEST_TARGETS = $(addprefix check-,$(TEST_DIRS)) +# TESTS exists for the user to pass on the command line to easily +# say "Only run these tests." With check-single it's not necessary, but +# with check-parallel there's no other way to (easily) specify a subset +# of tests. For consistency we support it for check-single as well. +# To specify all tests in a subdirectory, use TESTS=gdb.subdir/*.exp. +# E.g., make check TESTS="gdb.server/*.exp gdb.threads/*.exp". +@GMAKE_TRUE@TESTS := +@GMAKE_FALSE@TESTS = + +@GMAKE_TRUE@ifeq ($(strip $(TESTS)),) +@GMAKE_TRUE@expanded_tests_or_none := +@GMAKE_TRUE@else +@GMAKE_TRUE@expanded_tests := $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/,$(TESTS)))) +@GMAKE_TRUE@expanded_tests_or_none := $(or $(expanded_tests),no-matching-tests-found) +@GMAKE_TRUE@endif +@GMAKE_FALSE@expanded_tests_or_none = $(TESTS) + +# Shorthand for running all the tests in a single directory. +@GMAKE_TRUE@check-gdb.%: +@GMAKE_TRUE@ $(MAKE) check TESTS="gdb.$*/*.exp" + +check-single: + $(DO_RUNTEST) $(RUNTESTFLAGS) $(expanded_tests_or_none) -# We explicitly re-invoke make here for two reasons. First, it lets -# us add a -k option, which makes the parallel check mimic the -# behavior of the serial check; and second, it means that we can still -# regenerate the sum and log files even if a sub-make fails -- which -# it usually does because dejagnu exits with an error if any test -# fails. check-parallel: - $(MAKE) -k $(TEST_TARGETS); \ + -rm -rf cache outputs temp + $(MAKE) -k do-check-parallel; \ $(SHELL) $(srcdir)/dg-extract-results.sh \ - $(addsuffix /gdb.sum,$(TEST_DIRS)) > gdb.sum; \ + `find outputs -name gdb.sum -print` > gdb.sum; \ $(SHELL) $(srcdir)/dg-extract-results.sh -L \ - $(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log - -$(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) - -# Each half (roughly) of the .exp files from gdb.base. -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 $(abs_builddir)/site.exp - @if test ! -d gdb.base$*; then mkdir gdb.base$*; fi - $(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTESTFLAGS) - -subdir_do: force - @for i in $(DODIRS); do \ - if [ -d ./$$i ] ; then \ - if (rootme=`pwd`/ ; export rootme ; \ - rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ - cd ./$$i; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \ - else exit 1 ; fi ; \ - else true ; fi ; \ - done + `find outputs -name gdb.log -print` > gdb.log + @sed -n '/=== gdb Summary ===/,$$ p' gdb.sum + +# Turn a list of .exp files into "check/" targets. Only examine .exp +# files appearing in a gdb.* directory -- we don't want to pick up +# lib/ by mistake. For example, gdb.linespec/linespec.exp becomes +# check/gdb.linespec/linespec.exp. The list is generally sorted +# alphabetically, but we take a few tests known to be slow and push +# them to the front of the list to try to lessen the overall time +# taken by the test suite -- if one of these tests happens to be run +# late, it will cause the overall time to increase. +@GMAKE_TRUE@ifeq ($(strip $(TESTS)),) +slow_tests = gdb.base/break-interp.exp gdb.base/interp.exp \ + gdb.base/multi-forks.exp +@GMAKE_TRUE@all_tests := $(shell cd $(srcdir) && find gdb.* -name '*.exp' -print) +@GMAKE_TRUE@reordered_tests := $(slow_tests) $(filter-out $(slow_tests),$(all_tests)) +@GMAKE_TRUE@TEST_TARGETS := $(addprefix check/,$(reordered_tests)) +@GMAKE_TRUE@else +@GMAKE_TRUE@TEST_TARGETS := $(addprefix check/,$(expanded_tests_or_none)) +@GMAKE_TRUE@endif + +do-check-parallel: $(TEST_TARGETS) + @: + +@GMAKE_TRUE@check/%.exp: +@GMAKE_TRUE@ -mkdir -p outputs/$* +@GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) + +check/no-matching-tests-found: + @echo "" + @echo "No matching tests found." + @echo "" + +# Utility rule invoked by step 2 of the build-perf rule. +@GMAKE_TRUE@workers/%.worker: +@GMAKE_TRUE@ mkdir -p gdb.perf/outputs/$* +@GMAKE_TRUE@ $(DO_RUNTEST) --status --outdir=gdb.perf/outputs/$* lib/build-piece.exp WORKER=$* GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=build-pieces + +# Utility rule to build tests that support it in parallel. +# The build is broken into 3 steps distinguished by GDB_PERFTEST_SUBMODE: +# gen-workers, build-pieces, final. +# +# GDB_PERFTEST_MODE appears *after* RUNTESTFLAGS here because we don't want +# anything in RUNTESTFLAGS to override it. +# +# We don't delete the outputs directory here as these programs can take +# awhile to build, and perftest.exp has support for deciding whether to +# recompile them. If you want to remove these directories, make clean. +# +# The point of step 1 is to construct the set of worker tasks for step 2. +# All of the information needed by build-piece.exp is contained in the name +# of the generated .worker file. +@GMAKE_TRUE@build-perf: $(abs_builddir)/site.exp +@GMAKE_TRUE@ rm -rf gdb.perf/workers +@GMAKE_TRUE@ mkdir -p gdb.perf/workers +@GMAKE_TRUE@ @: Step 1: Generate the build .worker files. +@GMAKE_TRUE@ $(DO_RUNTEST) --status --directory=gdb.perf --outdir gdb.perf/workers GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=gen-workers +@GMAKE_TRUE@ @: Step 2: Compile the pieces. Here is the build parallelism. +@GMAKE_TRUE@ $(MAKE) $$(cd gdb.perf && echo workers/*/*.worker) +@GMAKE_TRUE@ @: Step 3: Do the final link. +@GMAKE_TRUE@ $(DO_RUNTEST) --status --directory=gdb.perf --outdir gdb.perf GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=final + +# The default is to both compile and run the tests. +GDB_PERFTEST_MODE = both + +check-perf: all $(abs_builddir)/site.exp + @if test ! -d gdb.perf; then mkdir gdb.perf; fi + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf GDB_PERFTEST_MODE=$(GDB_PERFTEST_MODE) $(RUNTESTFLAGS) force:; -subdirs: - for dir in ${ALL_SUBDIRS} ; \ - do \ - echo "$$dir:" ; \ - if [ -d $$dir ] ; then \ - (rootme=`pwd`/ ; export rootme ; \ - rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ - cd $$dir; $(MAKE) $(TARGET_FLAGS_TO_PASS)); \ - fi; \ - done - clean mostlyclean: - -rm -f *~ core *.o a.out xgdb *.x *.grt + -rm -f *~ core *.o a.out xgdb *.x *.grt bigcore.corefile .gdb_history + -rm -f core.* *.tf *.cl tracecommandsscript copy1.txt zzz-gdbscript + -rm -f *.dwo *.dwp + -rm -rf outputs temp cache + -rm -rf gdb.perf/workers gdb.perf/outputs gdb.perf/temp gdb.perf/cache + -rm -f read1.so expect-read1 if [ x"${ALL_SUBDIRS}" != x ] ; then \ for dir in ${ALL_SUBDIRS}; \ do \ @@ -242,3 +308,31 @@ Makefile : Makefile.in config.status $(host_makefile_frag) config.status: configure $(SHELL) config.status --recheck + +TAGS: force + find $(srcdir) -name '*.exp' -print | \ + etags --regex='/proc[ \t]+\([^ \t]+\)/\1/' - + +# 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 + +# 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) + +# Build the read1 machinery. +.PHONY: read1 +read1: read1.so expect-read1