From f37129f4c6cc9e60f547fdfe0a28a984ddd8de73 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 16 Nov 2022 22:16:21 +0300 Subject: Add support for package-config task manifest value --- tests/integration/testscript | 61 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 10 deletions(-) (limited to 'tests/integration') diff --git a/tests/integration/testscript b/tests/integration/testscript index e60e09c..16d7002 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -1,6 +1,9 @@ # file : tests/integration/testscript # license : MIT; see accompanying LICENSE file +# NOTE: to see the worker execution progress run the test with the +# --no-diag-buffer option. + #\ # Requirement: # @@ -93,17 +96,18 @@ host='host: true' # #\ pkg = libbuild2-kconfig -ver = 0.2.0-a.0.20220629083402.1af9a330bb2b +ver = 0.3.0-a.0.20221118053819.f702eb65da87 rep_url = "https://github.com/build2/libbuild2-kconfig.git#master" rep_type = git #ver = 0.1.0-a.0.20200910053253.a71aa3f3938b #rep_url = https://stage.build2.org/1 #rep_type = pkg rfp = yes -requires='requires: bootstrap' -tests="tests: * libbuild2-kconfig-tests == $ver +requires = 'requires: bootstrap' +tests = "tests: * libbuild2-kconfig-tests == $ver examples: * kconfig-hello == $ver" -host='host: true' +host = 'host: true' +package_config = 'package-config: config.libbuild2-kconfig.develop=true' #dependency_checksum = 'dependency-checksum: 72ae02bed9a05aaf022147297a99b84d63b712e15d05cc073551da39003e87e8' #\ @@ -115,21 +119,36 @@ ver = 0.1.0-a.0.20220629084006.3c4928213194 rep_url = "https://github.com/build2/libbuild2-autoconf.git#master" rep_type = git rfp = yes -tests="tests: * libbuild2-autoconf-tests == $ver" -host='host: true' +tests = "tests: * libbuild2-autoconf-tests == $ver" +host = 'host: true' #\ #\ pkg = curl -ver = 7.76.0 -rep_url = https://pkg.cppget.org/1/testing +ver = 7.84.0 +rep_url = https://pkg.cppget.org/1/stable rep_type = pkg rfp = yes #\ #\ +pkg = bpkg +ver = 0.16.0-a.0.20221118054047.a6c6065d5c2a +rep_url = https://stage.build2.org/1 +rep_type = pkg +rfp = yes +package_config = 'package-config: +\ +config.bpkg.tests.remote=true +?libodb-sqlite +{ config.libodb_sqlite.develop=true } +?cli +{ config.cli.develop=true } +?sys:libsqlite3 +\' +#\ + +#\ pkg = cli -ver = 1.2.0-b.8.20220218142801.83de480a8bab +ver = 1.2.0-b.9.20221122090425.15876dcb479e rep_url = "https://git.codesynthesis.com/cli/cli.git#master" rep_type = git #rep_url = https://stage.build2.org/1 @@ -139,6 +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 }' #\ #\ @@ -154,7 +174,7 @@ tests="tests: libxsd-tests == $ver" #\ pkg = xsd -ver = 4.2.0-b.3.20220224113525.516981000564 +ver = 4.2.0-b.4.20221031121010.4fdbd8298c4d rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master" rep_type = git #rep_url = https://queue.stage.build2.org/1 @@ -164,10 +184,30 @@ requires='requires: host' tests="tests: * xsd-tests == $ver examples: * xsd-examples == $ver" host='host: true' +package_config = 'package-config: +\ +?libxerces-c +{ config.libxerces_c.network=true } +?libcurl/7.76.0 +?sys:libz +\' #dependency_checksum = 'dependency-checksum: 40a0ad4546d836a3afc83a9e7da22f2b5d224af4e62996d88f7103eaee23e9e1' #\ #\ +pkg = libxerces-c +ver = 3.2.4 +rep_url = https://pkg.cppget.org/1/stable +rep_type = pkg +rfp = yes +package_config = 'package-config: +\ +config.libxerces_c.network=true +"?libcurl ~7.76.0" +?sys:libz +\' +#\ + +#\ pkg = odb ver = 2.5.0-b.22.20220629083600.4a9af07ee566 rep_url = "https://git.codesynthesis.com/odb/odb.git#master" @@ -230,6 +270,7 @@ bpkg.test-separate-installed.create:\"config.cc.loptions=-L'$~/install/lib'\"" machine: $machine target: $target config: $config + $package_config $interactive $host worker-checksum: 1 -- cgit v1.1