diff options
| -rw-r--r-- | build2/b.cxx | 5 | ||||
| -rw-r--r-- | tests/common.testscript | 2 | ||||
| -rw-r--r-- | tests/directive/run.testscript | 10 | ||||
| -rw-r--r-- | tests/test/common.testscript | 2 | ||||
| -rw-r--r-- | tests/test/config-test/testscript | 2 | ||||
| -rw-r--r-- | tests/test/script/common.testscript | 2 | ||||
| -rw-r--r-- | tests/test/script/runner/redirect.testscript | 2 |
7 files changed, 11 insertions, 14 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index f939763..15844dc 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -375,11 +375,10 @@ main (int argc, char* argv[]) path::home_directory (), // The home variable is not assigned yet. default_options_files {{path ("b.options")}, nullopt /* start_dir */}, - [&trace, &verbosity] (const path& f, bool remote, bool overwrite) + [&trace, &verbosity] (const path& f, bool remote) { if (verbosity () >= 3) - trace << (overwrite ? "overwriting " : "loading ") - << (remote ? "remote " : "local ") << f; + trace << "loading " << (remote ? "remote " : "local ") << f; }), ops); } diff --git a/tests/common.testscript b/tests/common.testscript index ae54fe2..e70a90b 100644 --- a/tests/common.testscript +++ b/tests/common.testscript @@ -32,7 +32,7 @@ project = test amalgamation = EOI -test.options += --no-default-options --serial-stop --quiet +test.options += --serial-stop --quiet if ($null($buildfile) || !$buildfile) test.options += --buildfile - diff --git a/tests/directive/run.testscript b/tests/directive/run.testscript index 5f6187d..565ed67 100644 --- a/tests/directive/run.testscript +++ b/tests/directive/run.testscript @@ -8,32 +8,30 @@ crosstest = false .include ../common.testscript -run = "run '$0' --no-default-options noop" - : no-output : cat <'assert true' >=buildfile; -$* <"$run" +$* <"run '$0' noop" : output : cat <'print foo=bar' >=buildfile; $* <<"EOI" >'bar' -$run +run '$0' noop print \$foo EOI : bad-exit : cat <'assert false' >=buildfile; -$* <"$run" 2>>EOE != 0 +$* <"run '$0' noop" 2>>EOE != 0 buildfile:1:1: error: assertion failed EOE : bad-output : cat <'print run' >=buildfile; -$* <"$run" 2>>"EOE" != 0 +$* <"run '$0' noop" 2>>"EOE" != 0 <stdout>:1:4: error: expected executable name after run <stdin>:1:5: info: while parsing $0 output EOE diff --git a/tests/test/common.testscript b/tests/test/common.testscript index 722f426..0b82849 100644 --- a/tests/test/common.testscript +++ b/tests/test/common.testscript @@ -20,7 +20,7 @@ if ($null($test.options)) test.options = --buildfile - end -test.options += --no-default-options --serial-stop --quiet +test.options += --serial-stop --quiet # By default perform test. # diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript index 1dabfeb..996ddd3 100644 --- a/tests/test/config-test/testscript +++ b/tests/test/config-test/testscript @@ -5,7 +5,7 @@ # Setup a realistic test project that we will then exercise. # -test.options = --no-default-options --serial-stop --quiet +test.options = --serial-stop --quiet test.arguments = 'test(../proj/@./)' # Test out-of-src (for parallel). test.cleanups = &?**/ # Cleanup out directory structure. diff --git a/tests/test/script/common.testscript b/tests/test/script/common.testscript index 47af7a1..d51268a 100644 --- a/tests/test/script/common.testscript +++ b/tests/test/script/common.testscript @@ -32,6 +32,6 @@ end # automatically becoming dir{./}'s prerequisite. # c = cat >=testscript -b = $0 --no-default-options --serial-stop --quiet --buildfile - test \ +b = $0 --serial-stop --quiet --buildfile - test \ <"'testscript{testscript}: \$target'" \ &?test/*** diff --git a/tests/test/script/runner/redirect.testscript b/tests/test/script/runner/redirect.testscript index e3cc0d8..dfec2fd 100644 --- a/tests/test/script/runner/redirect.testscript +++ b/tests/test/script/runner/redirect.testscript @@ -16,7 +16,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex. cat <<EOI >=buildfile; testscript{testscript}: $target EOI - $0 --no-default-options --serial-stop --quiet test <foo >foo 2>bar + $0 --serial-stop --quiet test <foo >foo 2>bar } : null |