diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2023-08-28 15:57:14 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2023-08-28 16:19:44 +0300 |
| commit | 95aa319c1548fc81dfd018adc5ae8ec8db2e2f9c (patch) | |
| tree | 2e0224f122abe4c8bf9142d169466dcb27adb561 /tests/integration | |
| parent | 2c45274be4be9000c4de6ca5b1b9f0b32d7439cd (diff) | |
Add support for bbot.sys-install:config.install.root variable
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/testscript | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/tests/integration/testscript b/tests/integration/testscript index a608bef..060029e 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+10 +ver = 1.0.0+11 #rep_url = "https://git.build2.org/hello/libhello.git#1.0" #rep_type = git rep_url = https://stage.build2.org/1 @@ -96,6 +96,27 @@ config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\"" +export LD_LIBRARY_PATH="$~/usr/local/lib:$getenv('LD_LIBRARY_PATH')" #\ #\ +sys_install_dir = [dir_path] $~/sys-install/ +package_config = "package-config: +\\ ++bpkg.bindist.archive:--archive-build-meta= +bpkg.bindist.archive:config.install.relocatable=true + ++bbot.bindist.upload: + +bbot.sys-install.tar.extract:--directory=$sys_install_dir +bbot.sys-install.tar.extract:--strip-components=3 + +b.test-installed.configure:config.cc.loptions='-L$sys_install_dir/lib' +bpkg.test-separate-installed.create:config.cc.loptions='-L$sys_install_dir/lib' + +bpkg.create:config.bin.rpath=[null] +\\" +config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\" \ +bbot.sys-install:config.install.root=\"'$sys_install_dir'\"" ++export LD_LIBRARY_PATH="$sys_install_dir/lib:$getenv('LD_LIBRARY_PATH')" +#\ +#\ package_config = 'package-config: \ +bpkg.bindist.fedora: @@ -202,7 +223,7 @@ bpkg.module.create:config.bin.rpath=[null] # #\ pkg = libbuild2-autoconf -ver = 0.2.0-a.0.20230323135046.19cd67c1fa85 +ver = 0.2.0 rep_url = "https://github.com/build2/libbuild2-autoconf.git#master" rep_type = git rfp = yes @@ -235,7 +256,7 @@ config.bpkg.tests.remote=true #\ pkg = cli -ver = 1.2.0-b.9.20230320105544.115e8dc4c504 +ver = 1.2.0-b.10.20230822134113.24d21424af96 rep_url = "https://git.codesynthesis.com/cli/cli.git#master" rep_type = git #rep_url = https://stage.build2.org/1 @@ -455,5 +476,6 @@ a = $0 &?dist-install/*** &?redist-install/*** \ &?dist-installed/*** &?redist-installed/*** \ &?../usr/*** &?upload/*** &?upload.tar \ + &?../sys-install/*** \ &task.manifest <| 2>| } |