diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2016-01-19 11:06:11 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2016-01-19 11:06:11 -0500 |
| commit | 41d1845edace3cf5dabd0aa7fa376b801fd5f675 (patch) | |
| tree | 2926987c0caef560825b4c89486c53ffdfdcdb84 /gdb/testsuite/Makefile.in | |
| parent | 01ac68403c7d896de45b8c5f15dfeb2aee6e3444 (diff) | |
testsuite: Factor out --status in DO_RUNTEST
gdb/testsuite/ChangeLog:
* Makefile.in (DO_RUNTEST): Add --status and update usages.
Diffstat (limited to 'gdb/testsuite/Makefile.in')
| -rw-r--r-- | gdb/testsuite/Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 50edf8ac31..f59acc3ed9 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -169,7 +169,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 @@ -193,7 +193,7 @@ DO_RUNTEST = \ @GMAKE_TRUE@ $(MAKE) check TESTS="gdb.$*/*.exp" check-single: - $(DO_RUNTEST) --status $(RUNTESTFLAGS) $(expanded_tests_or_none) + $(DO_RUNTEST) $(RUNTESTFLAGS) $(expanded_tests_or_none) check-parallel: -rm -rf cache outputs temp @@ -229,7 +229,7 @@ do-check-parallel: $(TEST_TARGETS) @GMAKE_TRUE@check/%.exp: @GMAKE_TRUE@ -mkdir -p outputs/$* -@GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp --status $(RUNTESTFLAGS) +@GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) check/no-matching-tests-found: @echo "" @@ -239,7 +239,7 @@ check/no-matching-tests-found: # 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 +@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: @@ -259,11 +259,11 @@ check/no-matching-tests-found: @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@ $(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) --status --directory=gdb.perf --outdir gdb.perf GDB_PARALLEL=gdb.perf $(RUNTESTFLAGS) GDB_PERFTEST_MODE=compile GDB_PERFTEST_SUBMODE=final +@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 |