diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 16 | ||||
| -rw-r--r-- | gdb/testsuite/Makefile.in | 37 | ||||
| -rw-r--r-- | gdb/testsuite/lib/build-piece.exp | 39 | ||||
| -rw-r--r-- | gdb/testsuite/lib/cache.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 9 |
5 files changed, 22 insertions, 81 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 201213a..128023c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2015-07-25 Doug Evans <xdje42@gmail.com> + + Revert: + * Makefile.in (check/%.exp): Pass directory for GDB_PARALLEL. + (workers/%.worker, build-perf): New rule. + (GDB_PERFTEST_MODE): New variable. + (check-perf): Use it. + (clean): Clean up gdb.perf parallel build subdirs. + * lib/build-piece.exp: New file. + * lib/cache.exp (gdb_do_cache): Include $GDB_PARALLEL in path name. + * lib/gdb.exp (standard_output_file): Include $GDB_PARALLEL in path + name. + (standard_temp_file): Ditto. + (GDB_PARALLEL handling): Make outputs,temp,cache directories as subdirs + of $GDB_PARALLEL. + 2015-07-25 Patrick Palka <patrick@parcs.ath.cx> * gdb.gdb/selftest.exp (test_with_self): Update test to now diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index ffda7b9..c064f06 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -227,48 +227,16 @@ do-check-parallel: $(TEST_TARGETS) @GMAKE_TRUE@check/%.exp: @GMAKE_TRUE@ -mkdir -p outputs/$* -@GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=. --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) +@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) + $(DO_RUNTEST) --directory=gdb.perf --outdir gdb.perf GDB_PERFTEST_MODE=both $(RUNTESTFLAGS) force:; @@ -277,7 +245,6 @@ clean mostlyclean: -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}; \ diff --git a/gdb/testsuite/lib/build-piece.exp b/gdb/testsuite/lib/build-piece.exp deleted file mode 100644 index a81530c..0000000 --- a/gdb/testsuite/lib/build-piece.exp +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2014 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Utility to bootstrap building a piece of a performance test in a -# parallel build. -# See testsuite/Makefile.in:workers/%.worker. -# WORKER is set by the makefile and is -# "{program_name}/{program_name}-{worker_nr}". - -regexp "^\(.+\)/\(.+\)-\(\[0-9\]+\)$" $WORKER entire_match PROGRAM_NAME pname2 WORKER_NR - -if { ![info exists entire_match] || $entire_match != $WORKER } { - error "Bad value for WORKER: $WORKER" -} -if { $PROGRAM_NAME != $pname2 } { - error "Bad value for WORKER: $WORKER" -} - -# $subdir is set to "lib", because that is where this file lives, -# which is not what tests expect. -set subdir "gdb.perf" - -# $gdb_test_file_name is set to this file, build-piece, which is not what -# tests expect. -set gdb_test_file_name $PROGRAM_NAME - -source $srcdir/$subdir/${gdb_test_file_name}.exp diff --git a/gdb/testsuite/lib/cache.exp b/gdb/testsuite/lib/cache.exp index 9565b39..8df04b9 100644 --- a/gdb/testsuite/lib/cache.exp +++ b/gdb/testsuite/lib/cache.exp @@ -35,7 +35,7 @@ proc gdb_do_cache {name} { } if {[info exists GDB_PARALLEL]} { - set cache_filename [file join $objdir $GDB_PARALLEL cache $cache_name] + set cache_filename [file join $objdir cache $cache_name] if {[file exists $cache_filename]} { set fd [open $cache_filename] set gdb_data_cache($cache_name) [read -nonewline $fd] diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1f3f838..c5cfa4b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3980,7 +3980,7 @@ proc standard_output_file {basename} { global objdir subdir gdb_test_file_name GDB_PARALLEL if {[info exists GDB_PARALLEL]} { - set dir [file join $objdir $GDB_PARALLEL outputs $subdir $gdb_test_file_name] + set dir [file join $objdir outputs $subdir $gdb_test_file_name] file mkdir $dir return [file join $dir $basename] } else { @@ -3994,7 +3994,7 @@ proc standard_temp_file {basename} { global objdir GDB_PARALLEL if {[info exists GDB_PARALLEL]} { - return [file join $objdir $GDB_PARALLEL temp $basename] + return [file join $objdir temp $basename] } else { return $basename } @@ -5119,10 +5119,7 @@ if {[info exists GDB_PARALLEL]} { if {[is_remote host]} { unset GDB_PARALLEL } else { - file mkdir \ - [file join $GDB_PARALLEL outputs] \ - [file join $GDB_PARALLEL temp] \ - [file join $GDB_PARALLEL cache] + file mkdir outputs temp cache } } |