diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2024-01-26 17:45:23 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2024-01-26 17:45:23 +0300 |
| commit | 3d4a1aeab69d047b7de5c25a6f38b8fce0b00f01 (patch) | |
| tree | 1049ec058bc318d79afd58879bf0a4854ae6b054 /bbot/worker/worker.cxx | |
| parent | 2c39ac617baeef96882efc3c4d0babeb5d74a7d2 (diff) | |
Fix configuring runtime tests by stripping reflection variable from command line
Diffstat (limited to 'bbot/worker/worker.cxx')
| -rw-r--r-- | bbot/worker/worker.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 70c0f0b..8217c45 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -2999,10 +2999,10 @@ build (size_t argc, const char* argv[]) pkgs.push_back ("}+"); - // Add test dependency package constraints (for example - // 'bar > 1.0.0'). + // Add test dependency package constraints (strip the potential + // reflection variable assignment; for example 'bar > 1.0.0'). // - pkgs.push_back (t.string ()); + pkgs.push_back (t.dependency::string ()); } // Add the main package dependencies. @@ -3147,7 +3147,9 @@ build (size_t argc, const char* argv[]) pkgs.push_back ("}+"); - pkgs.push_back (t.string ()); + // Strip the potential reflection variable assignment. + // + pkgs.push_back (t.dependency::string ()); } } @@ -3233,7 +3235,8 @@ build (size_t argc, const char* argv[]) pkgs.push_back ("}+"); - // Strip the build-time mark. + // Strip the build-time mark and potential reflection variable + // assignment. // pkgs.push_back (t.dependency::string ()); } @@ -5154,7 +5157,9 @@ build (size_t argc, const char* argv[]) pkgs.push_back ("}+"); - pkgs.push_back (t.string ()); + // Strip the potential reflection variable assignment. + // + pkgs.push_back (t.dependency::string ()); } else ++no_vars; @@ -5187,7 +5192,9 @@ build (size_t argc, const char* argv[]) if (pkg_config_pkgs.find (t.name.string ()) == pkg_config_pkgs.end ()) { - pkgs.push_back (t.string ()); + // Strip the potential reflection variable assignment. + // + pkgs.push_back (t.dependency::string ()); } } @@ -5212,7 +5219,8 @@ build (size_t argc, const char* argv[]) pkgs.push_back ("}+"); } - // Strip the build-time mark. + // Strip the build-time mark and potential reflection variable + // assignment. // pkgs.push_back (t.dependency::string ()); } |