aboutsummaryrefslogtreecommitdiff
path: root/build2
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 /build2
parent1434ffdba68bdf935386cde56bb2fadd0cd352d5 (diff)
Make testscripts to ignore user's default options files
Diffstat (limited to 'build2')
-rw-r--r--build2/b.cxx5
1 files changed, 3 insertions, 2 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);
}