From 8283e34747d6409124517a217bb19354311030b2 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 19 Aug 2019 23:07:04 +0300 Subject: Make testscripts to ignore user's default options files --- build2/b.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build2') 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); } -- cgit v1.1