X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2FMakefile.in;h=7853275617e6f632b120269ad9294db38dd6ac46;hb=7efeed176a291c15c74e80aee5d7f906e28081cf;hp=1c923cd43796c29c2a22f1ed9b8edf96879aa60b;hpb=2a31c6236de308f7109720230e70b96c5d5b966a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 1c923cd437..7853275617 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -1,5 +1,5 @@ # Makefile for regression testing the GNU debugger. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 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.hp \ - 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,12 @@ RUNTESTFLAGS = FORCE_PARALLEL = +# 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 +126,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 @@ -145,7 +146,8 @@ installcheck: # 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_TRUE@CHECK_TARGET_TMP = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,$(if $(saw_dash_j),check-parallel,check-single))) +@GMAKE_TRUE@CHECK_TARGET = $(if $(RACY_ITER),$(addsuffix -racy,$(CHECK_TARGET_TMP)),$(CHECK_TARGET_TMP)) @GMAKE_FALSE@CHECK_TARGET = check-single # Note that we must resort to a recursive make invocation here, @@ -169,7 +171,7 @@ DO_RUNTEST = \ if [ -f $${rootme}/../../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../../tcl/library ; \ export TCL_LIBRARY ; fi ; \ - $(RUNTEST) + $(RUNTEST) --status # 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 @@ -188,17 +190,68 @@ DO_RUNTEST = \ @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) +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); \ + 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 \ `find outputs -name gdb.sum -print` > gdb.sum; \ $(SHELL) $(srcdir)/dg-extract-results.sh -L \ - `find outputs -name gdb.log -print` > gdb.log - @sed -n '/=== gdb Summary ===/,$$ p' gdb.sum + `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)/dg-extract-results.sh \ + `find racy_outputs/$$n -name gdb.sum -print` > \ + racy_outputs/$$n/gdb.sum; \ + $(SHELL) $(srcdir)/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 @@ -213,9 +266,9 @@ 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@TEST_TARGETS := $(addprefix $(if $(RACY_ITER),check-racy,check)/,$(reordered_tests)) @GMAKE_TRUE@else -@GMAKE_TRUE@TEST_TARGETS := $(addprefix check/,$(expanded_tests_or_none)) +@GMAKE_TRUE@TEST_TARGETS := $(addprefix $(if $(RACY_ITER),check-racy,check)/,$(expanded_tests_or_none)) @GMAKE_TRUE@endif do-check-parallel: $(TEST_TARGETS) @@ -225,46 +278,70 @@ do-check-parallel: $(TEST_TARGETS) @GMAKE_TRUE@ -mkdir -p outputs/$* @GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) +do-check-parallel-racy: $(TEST_TARGETS) + @: + +@GMAKE_TRUE@check-racy/%.exp: +@GMAKE_TRUE@ -mkdir -p racy_outputs/$(RACY_OUTPUT_N)/$* +@GMAKE_TRUE@ $(DO_RUNTEST) GDB_PARALLEL=yes \ +@GMAKE_TRUE@ --outdir=racy_outputs/$(RACY_OUTPUT_N)/$* $*.exp \ +@GMAKE_TRUE@ $(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) --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) --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 + +# 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=both $(RUNTESTFLAGS) + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf GDB_PERFTEST_MODE=$(GDB_PERFTEST_MODE) $(RUNTESTFLAGS) force:; clean mostlyclean: -rm -f *~ core *.o a.out xgdb *.x *.grt bigcore.corefile .gdb_history - -rm -f core.* *.tf *.cl *.py tracecommandsscript copy1.txt zzz-gdbscript + -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 \ - 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