1 files changed, 58 insertions, 18 deletions
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 988859f..2a181f2 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -64,7 +64,7 @@ b.test-installed.configure:\"config.cc.loptions=-L'$~/install/lib'\" \
 bpkg.test-separate-installed.create:\"config.cc.loptions=-L'$~/install/lib'\""
 
 pkg = libhello
-ver = 1.0.0+11
+ver = 1.0.0+12
 #rep_url = "https://git.build2.org/hello/libhello.git#1.0"
 #rep_type = git
 rep_url = https://stage.build2.org/1
@@ -76,6 +76,7 @@ rfp = yes
 #package_config = 'package-config: { config.libhello.extras=true }+ libhello'
 #package_config = 'package-config: +bbot.install.ldconfig:'
 #package_config = 'package-config: -bpkg.install:'
+#package_config = 'package-config: -b.test-installed.create:'
 #\
 package_config = "package-config:
 \\
@@ -153,14 +154,14 @@ rfp = yes
 #
 #\
 pkg = libbuild2-hello
-ver = 0.1.0
+ver = 0.2.0
 rep_url = "https://github.com/build2/libbuild2-hello.git#master"
 rep_type = git
 #rep_url = https://stage.build2.org/1
 #rep_type = pkg
 rfp = yes
-tests="tests: * libbuild2-hello-tests == $ver"
-host='host: true'
+tests = "tests: * libbuild2-hello-tests == $ver"
+host = 'host: true'
 #\
 #package_config = 'package-config: -bpkg.install:'
 #\
@@ -175,7 +176,7 @@ bpkg.module.create:config.bin.rpath=[null]
 #
 #\
 pkg = libbuild2-kconfig
-ver = 0.3.0-a.0.20221118053819.f702eb65da87
+ver = 0.3.0
 rep_url = "https://github.com/build2/libbuild2-kconfig.git#master"
 rep_type = git
 #ver = 0.1.0-a.0.20200910053253.a71aa3f3938b
@@ -222,7 +223,7 @@ bpkg.module.create:config.bin.rpath=[null]
 #
 #\
 pkg = libbuild2-autoconf
-ver = 0.2.0
+ver = 0.3.0
 rep_url = "https://github.com/build2/libbuild2-autoconf.git#master"
 rep_type = git
 rfp = yes
@@ -232,7 +233,7 @@ host = 'host: true'
 
 #\
 pkg = curl
-ver = 7.84.0
+ver = 8.8.0+1
 rep_url = https://pkg.cppget.org/1/stable
 rep_type = pkg
 rfp = yes
@@ -266,6 +267,7 @@ tests="tests: * cli-tests == $ver
 examples: * cli-examples == $ver"
 host='host: true'
 #\
+#package_config = "package-config: -b.test-installed.create: -bpkg.test-separate-installed.create:"
 #\
 package_config = "package-config:
 \\
@@ -303,7 +305,7 @@ bpkg.create:config.bin.rpath=[null]
 
 #\
 pkg = libxsd
-ver = 4.2.0-b.3.20220224113525.516981000564
+ver = 4.2.1-a.0.20231121133547.a821131cf17a
 rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master"
 rep_type = git
 #rep_url = https://stage.build2.org/1
@@ -314,7 +316,7 @@ tests="tests: libxsd-tests == $ver"
 
 #\
 pkg = xsd
-ver = 4.2.0-b.4.20230320140030.aafc60b2e901
+ver = 4.2.1-a.0.20231121133547.a821131cf17a
 rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master"
 rep_type = git
 #rep_url = https://queue.stage.build2.org/1
@@ -372,12 +374,30 @@ sys:libz/*
 
 #\
 pkg = odb
-ver = 2.5.0-b.22.20220629083600.4a9af07ee566
+ver = 2.5.0-b.28.20241111061718.ed3e5d842791
 rep_url = "https://git.codesynthesis.com/odb/odb.git#master"
 rep_type = git
 rfp = yes
 requires='requires: host'
 host='host: true'
+package_config = 'package-config:
+\
++bpkg.bindist.archive:
++bbot.bindist.upload:
+bpkg.bindist.archive:--recursive=auto
+
+bpkg.bindist.archive:--archive-install-root=/tmp
+bbot.sys-install:config.install.root=/tmp/install
+bbot.sys-install.tar.extract:--directory=/tmp/install
+bbot.sys-install.tar.extract:--strip-components=1
+
+bpkg.create:config.bin.lib=static
+bpkg.create:config.cc.coptions=-fPIC
+
+b.create:config.cc.coptions="-Wall -Werror -O2 -fstack-protector-strong "
+
+b.create:config.cxx.std=c++11
+\'
 #\
 
 #\
@@ -408,11 +428,21 @@ rfp = yes
 
 #\
 pkg = libodb-sqlite
-ver = 2.5.0-b.26.20240131175206.1c7f67f47770
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
+ver = 2.5.0-b.28.20241030072332.1de3f3f222ba
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#win-bin"
 rep_type = git
 rfp = yes
-tests="tests: odb-tests == $ver"' ? (!$defined(config.odb_tests.database)) config.odb_tests.database=sqlite'
+tests="tests: odb-tests == $ver"' ? (!$defined(config.odb_tests.database)) config.odb_tests.database=sqlite
+tests: odb-examples == '"$ver"' ? (!$defined(config.odb_examples.database)) config.odb_examples.database=sqlite'
+
+package_config = 'package-config:
+\
+# Configure odb-{tests,examples} packages dependency libodb as system on the
+# bpkg.test-separate-installed.configure.build step, since it is
+# already installed as a dependency of libodb-sqlite.
+#
+{ --config-uuid=00000000-0000-0000-0000-000000000005 }+ ?sys:libodb/*
+\'
 #\
 #\
 package_config = 'package-config:
@@ -424,10 +454,11 @@ package_config = 'package-config:
 #\
 pkg = libodb-pgsql
 ver = 2.5.0-b.26.20240131175206.1c7f67f47770
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#master"
 rep_type = git
 rfp = yes
-tests="tests: odb-tests == $ver"' ? (!$defined(config.odb_tests.database)) config.odb_tests.database=pgsql'
+tests="tests: odb-tests == $ver"' ? (!$defined(config.odb_tests.database)) config.odb_tests.database=pgsql
+tests: odb-examples == '"$ver"' ? (!$defined(config.odb_examples.database)) config.odb_examples.database=pgsql'
 #\
 #\
 package_config = 'package-config:
@@ -439,7 +470,7 @@ package_config = 'package-config:
 #\
 pkg = odb-tests
 ver = 2.5.0-b.26.20240131175206.1c7f67f47770
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#master"
 rep_type = git
 rfp = yes
 #\
@@ -453,7 +484,7 @@ config.odb_tests.database="sqlite pgsql"
 #\
 pkg = libodb-oracle
 ver = 2.5.0-b.26.20240201133448.3fa01c83a095
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#master"
 rep_type = git
 rfp = yes
 package_config = 'package-config:
@@ -465,9 +496,18 @@ config.cc.poptions+=-I/usr/include/oracle/12.2/client64 config.cc.loptions+=-L/u
 #\
 pkg = libodb-qt
 ver = 2.5.0-b.26.20240201180613.633ad7ccad39
-rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#multi-package"
+rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#master"
+rep_type = git
+rfp = yes
+#\
+
+#\
+pkg = libQt6Widgets
+ver = 6.7.3
+rep_url = "https://github.com/build2-packaging/Qt6.git#master"
 rep_type = git
 rfp = yes
+tests="tests: libQt6WidgetsTests == $ver"
 #\
 
 #interactive="interactive: b.test-installed.configure"