From 3d4a1aeab69d047b7de5c25a6f38b8fce0b00f01 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 26 Jan 2024 17:45:23 +0300
Subject: Fix configuring runtime tests by stripping reflection variable from
 command line

---
 bbot/worker/worker.cxx       | 24 ++++++++++++++++--------
 tests/integration/testscript | 12 ++++--------
 2 files changed, 20 insertions(+), 16 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 ());
               }
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 8af2174..fa5975f 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -407,16 +407,12 @@ rfp = yes
 #\
 
 #\
-pkg = odb-tests
-ver = 2.5.0-b.26.20240122073830.3e1714e9aa78
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb-tests.git#master"
+pkg = libodb-sqlite
+ver = 2.5.0-b.26.20240126104805.4f18f07c8edc
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
 rep_type = git
 rfp = yes
-
-package_config = 'package-config:
-\
-config.odb_tests.database=sqlite
-\'
+tests="tests: odb-tests == $ver config.odb_tests.database+=sqlite"
 #\
 
 #interactive="interactive: b.test-installed.configure"
-- 
cgit v1.1