From 899ac9be4de6884b409d236297353a7bf6517d95 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 23 Jul 2019 14:35:58 +0300
Subject: Increase verbosity level of build2 create/configure meta-operations
 run by worker from -v to -V

---
 bbot/worker/worker.cxx       | 20 ++++++++++++++++----
 doc/manual.cli               |  3 ++-
 tests/integration/testscript |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 534670c..fc632ca 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -212,6 +212,7 @@ static result_status
 run_b (tracer& t,
        string& log, const regexes& warn_detect,
        const V& envvars,
+       const char* verbosity,
        const strings& buildspecs, A&&... a)
 {
   string name ("b");
@@ -227,7 +228,7 @@ run_b (tracer& t,
                   log, warn_detect,
                   name,
                   process_env ("b", envvars),
-                  "-v", buildspecs, forward<A> (a)...);
+                  verbosity, buildspecs, forward<A> (a)...);
 }
 
 template <typename V, typename... A>
@@ -235,23 +236,29 @@ static result_status
 run_b (tracer& t,
        string& log, const regexes& warn_detect,
        const V& envvars,
+       const char* verbosity,
        const string& buildspec, A&&... a)
 {
   return run_cmd (t,
                   log, warn_detect,
                   "b " + buildspec,
                   process_env ("b", envvars),
-                  "-v", buildspec, forward<A> (a)...);
+                  verbosity, buildspec, forward<A> (a)...);
 }
 
 template <typename... A>
 static result_status
 run_b (tracer& t,
        string& log, const regexes& warn_detect,
+       const char* verbosity,
        const string& buildspec, A&&... a)
 {
   const char* const* envvars (nullptr);
-  return run_b (t, log, warn_detect, envvars, buildspec, forward<A> (a)...);
+  return run_b (t,
+                log, warn_detect,
+                envvars,
+                verbosity,
+                buildspec, forward<A> (a)...);
 }
 
 static int bbot::
@@ -505,6 +512,7 @@ build (size_t argc, const char* argv[])
       r.status |= run_bpkg (
         trace, r.log, wre,
         "create",
+        "--build-option", "-V",
         "-d", build_dir.string (),
         "--wipe",
         step_args (modules,  step_id::bpkg_configure_create),
@@ -567,6 +575,7 @@ build (size_t argc, const char* argv[])
       r.status |= run_bpkg (
         trace, r.log, wre,
         "build",
+        "--build-option", "-V",
         "--configure-only",
         "--yes",
         step_args (config_args, step_id::bpkg_configure_build),
@@ -762,6 +771,7 @@ build (size_t argc, const char* argv[])
 
       r.status |= run_b (
         trace, r.log, wre,
+        "-V",
         "create(" + out_dir.representation () + mods + ")",
         step_args (config_args, step_id::b_test_installed_create),
         step_args (env_args,    step_id::b_test_installed_create));
@@ -804,8 +814,9 @@ build (size_t argc, const char* argv[])
         r.status |= run_b (
           trace, r.log, wre,
           envvars,
+          "-V",
           "configure(" +
-          subprj_src_dir.representation ()  + '@' +
+          subprj_src_dir.representation () + '@' +
           subprj_out_dir.representation () + ")",
           step_args (config_args, step_id::b_test_installed_configure),
           step_args (env_args,    step_id::b_test_installed_configure));
@@ -831,6 +842,7 @@ build (size_t argc, const char* argv[])
       r.status |= run_b (
         trace, r.log, wre,
         envvars,
+        "-v",
         test_specs,
         step_args (config_args, step_id::b_test_installed_test),
         step_args (env_args,    step_id::b_test_installed_test));
diff --git a/doc/manual.cli b/doc/manual.cli
index fa0a17b..2c4c292 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -791,7 +791,8 @@ bpkg -v test <package-name>
   #
   bpkg -v install <package-name>
 
-  # if the package contains subprojects that support the test operation:
+  # if the package contains subprojects that support the test
+  # operation:
   #
   {
     # b.test-installed.create
diff --git a/tests/integration/testscript b/tests/integration/testscript
index f98d47b..0afef07 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -49,7 +49,7 @@ wait = 1 # Seconds.
 controller = --fake-request ../task --dump-result
 
 pkg = libhello
-ver = 1.0.0+1
+ver = 1.0.0+4
 #rep_url = https://build2.org/pkg/1/hello/stable
 #rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94
 rep_url = https://stage.build2.org/1
-- 
cgit v1.1