aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-08-19 23:07:04 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-08-19 23:07:04 +0300
commit8283e34747d6409124517a217bb19354311030b2 (patch)
treedc56afc38ec55816727257888e1ba7c4c4632b81
parent1434ffdba68bdf935386cde56bb2fadd0cd352d5 (diff)
Make testscripts to ignore user's default options files
-rw-r--r--build2/b.cxx5
-rw-r--r--tests/common.testscript2
-rw-r--r--tests/directive/run.testscript10
-rw-r--r--tests/test/common.testscript2
-rw-r--r--tests/test/config-test/testscript2
-rw-r--r--tests/test/script/common.testscript2
-rw-r--r--tests/test/script/runner/redirect.testscript2
7 files changed, 14 insertions, 11 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 15844dc..f939763 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -375,10 +375,11 @@ 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)
+ [&trace, &verbosity] (const path& f, bool remote, bool overwrite)
{
if (verbosity () >= 3)
- trace << "loading " << (remote ? "remote " : "local ") << f;
+ trace << (overwrite ? "overwriting " : "loading ")
+ << (remote ? "remote " : "local ") << f;
}),
ops);
}
diff --git a/tests/common.testscript b/tests/common.testscript
index e70a90b..ae54fe2 100644
--- a/tests/common.testscript
+++ b/tests/common.testscript
@@ -32,7 +32,7 @@ project = test
amalgamation =
EOI
-test.options += --serial-stop --quiet
+test.options += --no-default-options --serial-stop --quiet
if ($null($buildfile) || !$buildfile)
test.options += --buildfile -
diff --git a/tests/directive/run.testscript b/tests/directive/run.testscript
index 565ed67..5f6187d 100644
--- a/tests/directive/run.testscript
+++ b/tests/directive/run.testscript
@@ -8,30 +8,32 @@ crosstest = false
.include ../common.testscript
+run = "run '$0' --no-default-options noop"
+
: no-output
:
cat <'assert true' >=buildfile;
-$* <"run '$0' noop"
+$* <"$run"
: output
:
cat <'print foo=bar' >=buildfile;
$* <<"EOI" >'bar'
-run '$0' noop
+$run
print \$foo
EOI
: bad-exit
:
cat <'assert false' >=buildfile;
-$* <"run '$0' noop" 2>>EOE != 0
+$* <"$run" 2>>EOE != 0
buildfile:1:1: error: assertion failed
EOE
: bad-output
:
cat <'print run' >=buildfile;
-$* <"run '$0' noop" 2>>"EOE" != 0
+$* <"$run" 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 0b82849..722f426 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 += --serial-stop --quiet
+test.options += --no-default-options --serial-stop --quiet
# By default perform test.
#
diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript
index 996ddd3..1dabfeb 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 = --serial-stop --quiet
+test.options = --no-default-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 d51268a..47af7a1 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 --serial-stop --quiet --buildfile - test \
+b = $0 --no-default-options --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 dfec2fd..e3cc0d8 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 --serial-stop --quiet test <foo >foo 2>bar
+ $0 --no-default-options --serial-stop --quiet test <foo >foo 2>bar
}
: null