From a37431f8109cb67937ad5356e8209a7151ad5a61 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 19 Aug 2019 23:41:49 +0300
Subject: Make testscripts to ignore user's default options files

---
 bdep/sync.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bdep/sync.cxx')

diff --git a/bdep/sync.cxx b/bdep/sync.cxx
index 26781eb..7599148 100644
--- a/bdep/sync.cxx
+++ b/bdep/sync.cxx
@@ -870,8 +870,8 @@ namespace bdep
     default_options_files r {{path ("bdep.options")}, nullopt};
 
     // Add bdep-sync-implicit.options for an implicit sync and
-    // bdep-sync.options otherwise. Omit the search start dir in the former
-    // case.
+    // bdep-sync.options otherwise. In the former case try to find a common
+    // start directory using the configuration directories.
     //
     auto add = [&r] (const string& n)
     {
@@ -881,12 +881,14 @@ namespace bdep
     if (o.implicit () || o.hook_specified ())
     {
       add ("sync-implicit");
+
+      r.start = default_options_start (home_directory (), o.config ());
     }
     else
     {
       add ("sync");
 
-      r.start_dir = find_project (o);
+      r.start = find_project (o);
     }
 
     return r;
@@ -913,6 +915,7 @@ namespace bdep
         forbid ("--directory|-d", o.directory_specified ());
         forbid ("--implicit",     o.implicit ());
         forbid ("--hook",         o.hook_specified ());
+        forbid ("--config|-c",    o.config_specified ());
       });
   }
 }
-- 
cgit v1.1