X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2FMakefile.in;h=2beba053ee65a6642e5908ebadd63b78fd54c3c9;hb=b078f3ac8803297bfc8416c20e09d0863c5ac6cc;hp=f59acc3ed9bbbaa1ebbf0f785e2a8e213efea5de;hpb=41d1845edace3cf5dabd0aa7fa376b801fd5f675;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index f59acc3ed9..2beba053ee 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -1,5 +1,5 @@ # Makefile for regression testing the GNU debugger. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2019 Free Software Foundation, Inc. # This file is part of GDB. @@ -21,6 +21,7 @@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ target_alias = @target_noncanonical@ program_transform_name = @program_transform_name@ @@ -32,12 +33,6 @@ SHELL = @SHELL@ EXEEXT = @EXEEXT@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ -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) EXTRA_RULES = @EXTRA_RULES@ @@ -57,6 +52,15 @@ RUNTESTFLAGS = FORCE_PARALLEL = +GDB_DEBUG = +GDBSERVER_DEBUG = + +# Default number of iterations that we will use to run the testsuite +# if the user does not specify the RACY_ITER environment variable +# (e.g., when the user calls the make rule directly from the command +# line). +DEFAULT_RACY_ITER = 3 + RUNTEST_FOR_TARGET = `\ if [ -f $${srcdir}/../../dejagnu/runtest ]; then \ echo $${srcdir}/../../dejagnu/runtest; \ @@ -125,7 +129,7 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile @echo "set target_alias $(target_alias)" >> ./tmp0 @echo "set target_triplet ${target_canonical}" >> ./tmp0 @echo "set build_triplet ${build_canonical}" >> ./tmp0 - @echo "set srcdir ${srcdir}" >> ./tmp0 + @echo "set srcdir ${abs_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 @@ -136,17 +140,17 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile installcheck: -# 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))) +# See whether -j was given to make. Before GNU make 4.2, 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. Starting with +# GNU make 4.2, it always appears as "-j"/"-jN" in a separate word. +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 +# 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. +CHECK_TARGET_TMP = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,$(if $(saw_dash_j),check-parallel,check-single))) +CHECK_TARGET = $(if $(RACY_ITER),$(addsuffix -racy,$(CHECK_TARGET_TMP)),$(CHECK_TARGET_TMP)) # Note that we must resort to a recursive make invocation here, # because GNU make 3.82 has a bug preventing MAKEFLAGS from being used @@ -157,13 +161,21 @@ check: all $(abs_builddir)/site.exp check-read1: $(MAKE) READ1="1" check +# Check whether we need to print the timestamp for each line of +# status. +TIMESTAMP = $(if $(TS),| $(srcdir)/print-ts.py $(if $(TS_FORMAT),$(TS_FORMAT),),) + +gdb_debug = $(if $(GDB_DEBUG),GDB_DEBUG=$(GDB_DEBUG) ; export GDB_DEBUG ;,) +gdbserver_debug = $(if $(GDBSERVER_DEBUG),GDBSERVER_DEBUG=$(GDBSERVER_DEBUG) ; export GDBSERVER_DEBUG ;,) + + # All the hair to invoke dejagnu. A given invocation can just append # $(RUNTESTFLAGS) DO_RUNTEST = \ rootme=`pwd`; export rootme; \ srcdir=${srcdir} ; export srcdir ; \ EXPECT=${EXPECT} ; export EXPECT ; \ - EXEEXT=${EXEEXT} ; export EXEEXT ; \ + EXEEXT=${EXEEXT} ; export EXEEXT ; $(gdb_debug) $(gdbserver_debug) \ $(RPATH_ENVVAR)=$$rootme/../../expect:$$rootme/../../libstdc++:$$rootme/../../tk/unix:$$rootme/../../tcl/unix:$$rootme/../../bfd:$$rootme/../../opcodes:$$$(RPATH_ENVVAR); \ export $(RPATH_ENVVAR); \ if [ -f $${rootme}/../../expect/expect ] ; then \ @@ -177,35 +189,78 @@ DO_RUNTEST = \ # 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 = +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) +ifeq ($(strip $(TESTS)),) +expanded_tests_or_none := +else +expanded_tests := $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/,$(TESTS)))) +expanded_tests_or_none := $(or $(expanded_tests),no-matching-tests-found) +endif # Shorthand for running all the tests in a single directory. -@GMAKE_TRUE@check-gdb.%: -@GMAKE_TRUE@ $(MAKE) check TESTS="gdb.$*/*.exp" +check-gdb.%: + $(MAKE) check TESTS="gdb.$*/*.exp" check-single: - $(DO_RUNTEST) $(RUNTESTFLAGS) $(expanded_tests_or_none) + $(DO_RUNTEST) $(RUNTESTFLAGS) $(expanded_tests_or_none) $(TIMESTAMP) + +check-single-racy: + -rm -rf cache racy_outputs temp + mkdir -p racy_outputs; \ + racyiter="$(RACY_ITER)"; \ + test "x$$racyiter" == "x" && \ + racyiter=$(DEFAULT_RACY_ITER); \ + if test $$racyiter -lt 2 ; then \ + echo "RACY_ITER must be at least 2."; \ + exit 1; \ + fi; \ + trap "exit" INT; \ + for n in `seq $$racyiter` ; do \ + mkdir -p racy_outputs/$$n; \ + $(DO_RUNTEST) --outdir=racy_outputs/$$n $(RUNTESTFLAGS) \ + $(expanded_tests_or_none) $(TIMESTAMP); \ + done; \ + $(srcdir)/analyze-racy-logs.py \ + `ls racy_outputs/*/gdb.sum` > racy.sum; \ + sed -n '/=== gdb Summary ===/,$$ p' racy.sum check-parallel: -rm -rf cache outputs temp $(MAKE) -k do-check-parallel; \ result=$$?; \ - $(SHELL) $(srcdir)/dg-extract-results.sh \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ `find outputs -name gdb.sum -print` > gdb.sum; \ - $(SHELL) $(srcdir)/dg-extract-results.sh -L \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ `find outputs -name gdb.log -print` > gdb.log; \ sed -n '/=== gdb Summary ===/,$$ p' gdb.sum; \ exit $$result +check-parallel-racy: + -rm -rf cache racy_outputs temp + racyiter="$(RACY_ITER)"; \ + test "x$$racyiter" == "x" && \ + racyiter=$(DEFAULT_RACY_ITER); \ + if test $$racyiter -lt 2 ; then \ + echo "RACY_ITER must be at least 2."; \ + exit 1; \ + fi; \ + trap "exit" INT; \ + for n in `seq $$racyiter` ; do \ + $(MAKE) -k do-check-parallel-racy \ + RACY_OUTPUT_N=$$n; \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ + `find racy_outputs/$$n -name gdb.sum -print` > \ + racy_outputs/$$n/gdb.sum; \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ + `find racy_outputs/$$n -name gdb.log -print` > \ + racy_outputs/$$n/gdb.log; \ + sed -n '/=== gdb Summary ===/,$$ p' racy_outputs/$$n/gdb.sum; \ + done; \ + $(srcdir)/analyze-racy-logs.py \ + `ls racy_outputs/*/gdb.sum` > racy.sum; \ + sed -n '/=== gdb Summary ===/,$$ p' racy.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 @@ -214,22 +269,31 @@ check-parallel: # 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)),) +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 +all_tests := $(shell cd $(srcdir) && find gdb.* -name '*.exp' -print) +reordered_tests := $(slow_tests) $(filter-out $(slow_tests),$(all_tests)) +TEST_TARGETS := $(addprefix $(if $(RACY_ITER),check-racy,check)/,$(reordered_tests)) +else +TEST_TARGETS := $(addprefix $(if $(RACY_ITER),check-racy,check)/,$(expanded_tests_or_none)) +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/%.exp: + -mkdir -p outputs/$* + @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) $(TIMESTAMP) + +do-check-parallel-racy: $(TEST_TARGETS) + @: + +check-racy/%.exp: + -mkdir -p racy_outputs/$(RACY_OUTPUT_N)/$* + $(DO_RUNTEST) GDB_PARALLEL=yes \ + --outdir=racy_outputs/$(RACY_OUTPUT_N)/$* $*.exp \ + $(RUNTESTFLAGS) $(TIMESTAMP) check/no-matching-tests-found: @echo "" @@ -237,9 +301,9 @@ check/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) --outdir=gdb.perf/outputs/$* lib/build-piece.exp WORKER=$* GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=build-pieces +workers/%.worker: + mkdir -p gdb.perf/outputs/$* + $(DO_RUNTEST) --outdir=gdb.perf/outputs/$* lib/build-piece.exp WORKER=$* GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=build-pieces $(TIMESTAMP) # Utility rule to build tests that support it in parallel. # The build is broken into 3 steps distinguished by GDB_PERFTEST_SUBMODE: @@ -255,22 +319,22 @@ check/no-matching-tests-found: # 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) --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) --directory=gdb.perf --outdir gdb.perf GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=final +build-perf: $(abs_builddir)/site.exp + rm -rf gdb.perf/workers + mkdir -p gdb.perf/workers + @: Step 1: Generate the build .worker files. + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf/workers GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=gen-workers $(TIMESTAMP) + @: Step 2: Compile the pieces. Here is the build parallelism. + $(MAKE) $$(cd gdb.perf && echo workers/*/*.worker) + @: Step 3: Do the final link. + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=final $(TIMESTAMP) # 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) + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf GDB_PERFTEST_MODE=$(GDB_PERFTEST_MODE) $(RUNTESTFLAGS) $(TIMESTAMP) force:; @@ -281,29 +345,11 @@ clean mostlyclean: -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 \ - echo "$$dir:"; \ - if [ -d $$dir ]; then \ - (cd $$dir; $(MAKE) clean); \ - fi; \ - done ; \ - else true; fi distclean maintainer-clean realclean: clean -rm -f *~ core -rm -f Makefile config.status *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* - if [ x"${ALL_SUBDIRS}" != x ] ; then \ - for dir in ${ALL_SUBDIRS}; \ - do \ - echo "$$dir:"; \ - if [ -d $$dir ]; then \ - (cd $$dir; $(MAKE) distclean); \ - fi; \ - done ; \ - else true; fi Makefile : Makefile.in config.status $(host_makefile_frag) $(SHELL) config.status @@ -313,7 +359,9 @@ config.status: configure TAGS: force find $(srcdir) -name '*.exp' -print | \ - etags --regex='/proc[ \t]+\([^ \t]+\)/\1/' - + etags \ + --regex='/\(proc\|proc_with_prefix\|gdb_caching_proc\)[ \t]+\([^ \t]+\)/\2/' \ + - # Build the expect wrapper script that preloads the read1.so library. expect-read1: @@ -338,3 +386,6 @@ read1.so: lib/read1.c # Build the read1 machinery. .PHONY: read1 read1: read1.so expect-read1 + +# Disable implicit make rules. +include $(srcdir)/../disable-implicit-rules.mk