From b9456fe43f5b1d534d3345a6c6f84534e11b7fd3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 20 Oct 2020 12:10:22 +0300 Subject: Fix potential confusion for combined log reader --- bbot/worker/worker.cxx | 7 +++++++ tests/integration/testscript | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 5979ec6..0489822 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -1332,6 +1332,13 @@ build (size_t argc, const char* argv[]) ? *test_result : add_result ("test")); + // Noop, just for the log record to reduce the potential confusion for + // the combined log reader due to updating the build system module in a + // separate configuration (see above for details). + // + if (module) + change_wd (trace, &r.log, current_directory ()); + // Run internal tests. // if (internal_tests) diff --git a/tests/integration/testscript b/tests/integration/testscript index 3f10d2e..078a4ae 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -89,7 +89,7 @@ rfp = yes # Use the build2 driver installed into ~/install/bin (see above). # pkg = libbuild2-kconfig -ver = 0.1.0-a.0.20200930082223.f97ea0ff51a6 +ver = 0.1.0-a.0.20201020073414.55e1dcf947d5 rep_url = "https://github.com/build2/libbuild2-kconfig.git#master" rep_type = git #ver = 0.1.0-a.0.20200910053253.a71aa3f3938b -- cgit v1.1