From b92c1c200deef9a4e2bbd686080ecc4c64c22d10 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 4 Apr 2023 01:10:44 +0300 Subject: Add support for bpkg.bindist.* step ids --- tests/integration/testscript | 51 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/integration/testscript b/tests/integration/testscript index 5c14d73..4da46c1 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -60,6 +60,19 @@ rep_type = pkg rfp = yes #host='host: true' #dependency_checksum = 'dependency-checksum: e6f10587696020674c260669f4e7000a0139df72467bff9770aea2f2b8b57ba0' + +#package_config = 'package-config: -bpkg.install:' + +#\ +package_config = 'package-config: +\ ++bpkg.bindist.fedora: +bpkg.create:config.bin.rpath=[null] +\' +#\ + +#+bpkg.bindist.archive:--archive-lang=cc=gcc11 + #\ package_config = 'package-config:\ bpkg.configure.fetch:--fetch-timeout=120 -bpkg.install: @@ -90,7 +103,7 @@ rfp = yes # #\ pkg = libbuild2-hello -ver = 0.1.0-a.0.20220111112708.b719144c077f +ver = 0.1.0 rep_url = "https://github.com/build2/libbuild2-hello.git#master" rep_type = git #rep_url = https://stage.build2.org/1 @@ -99,6 +112,14 @@ rfp = yes tests="tests: * libbuild2-hello-tests == $ver" host='host: true' #\ +#package_config = 'package-config: -bpkg.install:' +#\ +package_config = 'package-config: +\ ++bpkg.bindist.fedora: +bpkg.module.create:config.bin.rpath=[null] +\' +#\ # Use the build2 driver installed into ~/install/bin (see above). # @@ -115,9 +136,17 @@ requires = 'requires: bootstrap' tests = "tests: * libbuild2-kconfig-tests == $ver examples: * kconfig-hello == $ver" host = 'host: true' -package_config = 'package-config: config.libbuild2-kconfig.develop=true' -#dependency_checksum = 'dependency-checksum: 72ae02bed9a05aaf022147297a99b84d63b712e15d05cc073551da39003e87e8' #\ +#package_config = 'package-config: config.libbuild2-kconfig.develop=true' +#package_config = 'package-config: -bpkg.install:' +#\ +package_config = 'package-config: +\ ++bpkg.bindist.fedora: +bpkg.module.create:config.bin.rpath=[null] +\' +#\ +#dependency_checksum = 'dependency-checksum: 72ae02bed9a05aaf022147297a99b84d63b712e15d05cc073551da39003e87e8' # Use the build2 driver installed into ~/install/bin (see above). # @@ -166,8 +195,16 @@ requires='requires: host' tests="tests: * cli-tests == $ver examples: * cli-examples == $ver" host='host: true' -#package_config = 'package-config: ?libcutl +{ config.libcutl.develop=true }' #\ +#package_config = 'package-config: -bpkg.install:' +#\ +package_config = 'package-config: +\ ++bpkg.bindist.fedora: +bpkg.create:config.bin.rpath=[null] +\' +#\ +#package_config = 'package-config: ?libcutl +{ config.libcutl.develop=true }' #\ pkg = libxsd @@ -192,9 +229,13 @@ requires='requires: host' tests="tests: * xsd-tests == $ver examples: * xsd-examples == $ver" host='host: true' +#\ +#\ package_config = 'package-config: \ ?sys:libxerces-c --sys-install --sys-yes ++bpkg.bindist.fedora: +bpkg.create:config.bin.rpath=[null] \' #\ #package_config = 'package-config: @@ -334,7 +375,7 @@ a = $0 &?build/*** &?build-host/*** &?build-module/*** &?build-install/*** \ &?build-installed/*** &?build-installed-bpkg/*** \ &?build-installed-bpkg-module/*** &?build-installed-bpkg-host/*** \ - &?dist/*** &?redist/*** \ + &?dist/*** &?redist/*** &?bindist/*** \ &?dist-install/*** &?redist-install/*** \ &?dist-installed/*** &?redist-installed/*** \ &task.manifest <| 2>| -- cgit v1.1