From 539d23829e2857c480882bc9a1168c0007feaf67 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 7 Oct 2021 22:46:05 +0300
Subject: Change worker script to install tools and modules from configuration
 separate from build configuration

---
 tests/integration/testscript | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/integration/testscript b/tests/integration/testscript
index 446d32b..21dd8ad 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -78,7 +78,7 @@ rfp = yes
 #
 #\
 pkg = libbuild2-hello
-ver = 0.1.0-a.0.20210825084014.eb3be1879362
+ver = 0.1.0-a.0.20210928065245.4c3109c2b741
 rep_url = "https://github.com/build2/libbuild2-hello.git#master"
 rep_type = git
 #rep_url = https://stage.build2.org/1
@@ -116,8 +116,8 @@ rfp = yes
 
 #\
 pkg = cli
-ver = 1.2.0-b.7.20210809111954.1fa3edee47ff
-rep_url = "https://git.codesynthesis.com/cli/cli.git#adhoc-recipe"
+ver = 1.2.0-b.7.20211007073047.17ca8c504f73
+rep_url = "https://git.codesynthesis.com/cli/cli.git#master"
 rep_type = git
 #rep_url = https://stage.build2.org/1
 #rep_type = pkg
@@ -130,8 +130,8 @@ host='host: true'
 
 #\
 pkg = libxsd
-ver = 4.2.0-b.1.20210915070740.6235e4148bd7
-rep_url = "https://git.codesynthesis.com/xsd/xsd.git#test"
+ver = 4.2.0-b.1.20211007072931.2239061347d1
+rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master"
 rep_type = git
 #rep_url = https://stage.build2.org/1
 #rep_type = pkg
@@ -141,8 +141,8 @@ tests="tests: libxsd-tests == $ver"
 
 #\
 pkg = xsd
-ver = 4.2.0-b.1.20210915070740.6235e4148bd7
-rep_url = "https://git.codesynthesis.com/xsd/xsd.git#test"
+ver = 4.2.0-b.1.20211007072931.2239061347d1
+rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master"
 rep_type = git
 #rep_url = https://queue.stage.build2.org/1
 #rep_type = pkg
@@ -151,7 +151,7 @@ requires='requires: host'
 tests="tests: * xsd-tests == $ver
 examples: * xsd-examples == $ver"
 host='host: true'
-#dependency_checksum = 'dependency-checksum: 4c51751ab1872fb208cbd84b09799708296988d773d201156e3be6136c3246b7'
+#dependency_checksum = 'dependency-checksum: 40a0ad4546d836a3afc83a9e7da22f2b5d224af4e62996d88f7103eaee23e9e1'
 #\
 
 #\
@@ -244,10 +244,11 @@ a = $0
   chmod ugo+x $env;
   sleep $wait;
   $w --verbose 3 --startup --tftp-host $tftp --environments $~ \
-    &?build-module/*** &?build-host/*** &?build/*** \
+    &?build/*** &?build-host/*** &?build-module/*** &?build-install/*** \
     &?build-installed/*** &?build-installed-bpkg/*** \
     &?build-installed-bpkg-module/*** &?build-installed-bpkg-host/*** \
     &?dist/*** &?redist/*** \
+    &?dist-install/*** &?redist-install/*** \
     &?dist-installed/*** &?redist-installed/*** \
     &task.manifest <| 2>|
 }
-- 
cgit v1.1