aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2023-02-01 18:18:46 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2023-02-01 18:18:46 +0300
commit820df1888be8969fe13d45cef88af814aa4f1d73 (patch)
tree71668093d1c35bbcc03bb22b267f62b7d789251c
parent0e618b8ce70175e24c49b23310bbfa87d856ce5f (diff)
Adapt worker to added in bpkg support for system package manager
-rw-r--r--bbot/worker/worker.cxx2
-rw-r--r--tests/integration/testscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 79aac43..d8f2ae4 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -3395,7 +3395,7 @@ build (size_t argc, const char* argv[])
pkg_args.push_back (t.dependency::string ());
}
- pkg_args.push_back ("?sys:" + pkg);
+ pkg_args.push_back ("?sys:" + pkg_rev);
// Finally, configure all the test packages.
//
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 16d7002..e518e45 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -148,7 +148,7 @@ config.bpkg.tests.remote=true
#\
pkg = cli
-ver = 1.2.0-b.9.20221122090425.15876dcb479e
+ver = 1.2.0-b.9.20230109143034.6e32dd9c26d2
rep_url = "https://git.codesynthesis.com/cli/cli.git#master"
rep_type = git
#rep_url = https://stage.build2.org/1
@@ -158,7 +158,7 @@ requires='requires: host'
tests="tests: * cli-tests == $ver
examples: * cli-examples == $ver"
host='host: true'
-package_config = 'package-config: ?libcutl +{ config.libcutl.develop=true }'
+#package_config = 'package-config: ?libcutl +{ config.libcutl.develop=true }'
#\
#\