From 18baf3784407f28f61d9e8d90daf1ce99c7e86d3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 6 Sep 2021 16:38:36 +0300 Subject: Add support for target, host, and module package types --- tests/integration/testscript | 61 +++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 15 deletions(-) (limited to 'tests/integration') diff --git a/tests/integration/testscript b/tests/integration/testscript index 1408946..85dd91d 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -72,30 +72,36 @@ rep_type = pkg rfp = yes #\ -#\ # To make sure that the test-installed phase succeeds use the build2 driver -# installed into ~/install/bin. +# installed into a writable directory, for example, ~/install/bin. # +#\ pkg = libbuild2-hello -ver = 0.1.0-a.0.20201019074759.bba32abb6d3d +ver = 0.1.0-a.0.20210825084014.eb3be1879362 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' #\ -#\ # Use the build2 driver installed into ~/install/bin (see above). # +#\ pkg = libbuild2-kconfig -ver = 0.1.0-a.0.20210108084836.3687e4b95226 +ver = 0.1.0-a.0.20210825082040.000d8026a71f 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 +examples: * kconfig-hello == $ver" +host='host: true' #\ #\ @@ -108,36 +114,56 @@ rfp = yes #\ pkg = cli -ver = 1.2.0-b.7.20210311174126.7aba3e27228e +ver = 1.2.0-b.7.20210809111954.1fa3edee47ff rep_url = "https://git.codesynthesis.com/cli/cli.git#adhoc-recipe" rep_type = git #rep_url = https://stage.build2.org/1 #rep_type = pkg rfp = yes +requires='requires: host' +tests="tests: * cli-tests == $ver +examples: * cli-examples == $ver" +host='host: true' #\ #\ pkg = libxsd -ver = 4.2.0-b.1.20210302135218.6a71bc57f6eb -rep_url = "https://git.codesynthesis.com/xsd/xsd.git#master" +ver = 4.2.0-b.1.20210915070740.6235e4148bd7 +rep_url = "https://git.codesynthesis.com/xsd/xsd.git#test" rep_type = git #rep_url = https://stage.build2.org/1 #rep_type = pkg rfp = yes +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" +rep_type = git +#rep_url = https://queue.stage.build2.org/1 +#rep_type = pkg +rfp = yes +requires='requires: host' +tests="tests: * xsd-tests == $ver +examples: * xsd-examples == $ver" +host='host: true' #\ #\ pkg = libcmark-gfm-extensions ver = 0.29.0-a.1+7 -rep_url = https://pkg.cppget.org/1/alpha +rep_url = https://stage.build2.org/1 rep_type = pkg rfp = yes +host='host: true' #\ #\ pkg = non-existing ver = 0.1.0 -rep_url = https://pkg.cppget.org/1/alpha +rep_url = https://stage.build2.org/1 rep_type = pkg rfp = yes #\ @@ -146,12 +172,13 @@ rfp = yes # properly imported when configuring and running tests, and that the installed # executables are runnable. # -config = "\"config.install.root='$~/install'\" \ -bpkg:--fetch-timeout=60 \ -\"config.bin.rpath='$~/install/lib'\" \ +config = "bpkg.create:config.install.root=\"'$~/install'\" \ +bpkg.configure.fetch:--fetch-timeout=60 \ +bpkg.global.configure.build:--fetch-timeout=60 \ +bpkg.create:config.bin.rpath=\"'$~/install/lib'\" \ config.cc.coptions=-Wall \ b.test-installed.configure:\"config.cc.loptions=-L'$~/install/lib'\" \ -bpkg.test-installed.create:\"config.cc.loptions=-L'$~/install/lib'\"" +bpkg.test-separate-installed.create:\"config.cc.loptions=-L'$~/install/lib'\"" #interactive="interactive: bpkg.configure.build" #interactive="interactive: warning" @@ -163,10 +190,13 @@ bpkg.test-installed.create:\"config.cc.loptions=-L'$~/install/lib'\"" repository-url: $rep_url repository-type: $rep_type trust: $rfp + $requires + $tests machine: $machine target: $target config: $config $interactive + $host EOI +if ("$environment" != "") @@ -209,8 +239,9 @@ a = $0 chmod ugo+x $env; sleep $wait; $w --verbose 3 --startup --tftp-host $tftp --environments $~ \ - &?build-module/*** &?build/*** \ + &?build-module/*** &?build-host/*** &?build/*** \ &?build-installed/*** &?build-installed-bpkg/*** \ + &?build-installed-bpkg-module/*** &?build-installed-bpkg-host/*** \ &?dist/*** &?redist/*** \ &?dist-installed/*** &?redist-installed/*** \ &task.manifest <| 2>| -- cgit v1.1