From a37431f8109cb67937ad5356e8209a7151ad5a61 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 19 Aug 2019 23:41:49 +0300 Subject: Make testscripts to ignore user's default options files --- bdep/utility.hxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'bdep/utility.hxx') diff --git a/bdep/utility.hxx b/bdep/utility.hxx index 7f02b3c..c4cdef5 100644 --- a/bdep/utility.hxx +++ b/bdep/utility.hxx @@ -14,10 +14,11 @@ #include -#include // casecmp(), reverse_iterate(), etc +#include // casecmp(), reverse_iterate(), etc #include #include #include +#include #include // manifest_parser::filter_function #include // manifest_serializer::filter_function @@ -67,6 +68,12 @@ namespace bdep using butl::auto_rmfile; using butl::auto_rmdir; + // + // + using butl::load_default_options; + using butl::merge_default_options; + using butl::default_options_start; + // Empty string and path. // extern const string empty_string; @@ -119,6 +126,9 @@ namespace bdep dir_path current_directory (); + dir_path + home_directory (); + // Normalize a directory path. Also make the relative path absolute using // the current directory. // -- cgit v1.1