aboutsummaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2023-04-06 22:54:43 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2023-04-11 17:35:40 +0300
commit9abe5e449cc3dab0715ebc86de2a86e6cb8ecc63 (patch)
tree83f4126eeac2ee7b8d1d162836f40ebf303f1b7a /tests/integration
parent1a795ad9f5b8fe368a1e597c1bfb12fa112d2101 (diff)
Add support for bbot.sys-install step in worker
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/testscript80
1 files changed, 64 insertions, 16 deletions
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 9488691..597a10f 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -51,6 +51,18 @@ controller = https://stage.build2.org/?build-task
wait = 1 # Seconds.
controller = --fake-request ../task --dump-result
+# Note that we also need to make sure that the installed package libraries are
+# properly imported when configuring and running tests, and that the installed
+# executables are runnable.
+#
+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-separate-installed.create:\"config.cc.loptions=-L'$~/install/lib'\""
+
pkg = libhello
ver = 1.0.0+10
#rep_url = "https://git.build2.org/hello/libhello.git#1.0"
@@ -63,7 +75,23 @@ rfp = yes
#package_config = 'package-config: +bbot.install.ldconfig:'
#package_config = 'package-config: -bpkg.install:'
+#\
+package_config = "package-config:
+\\
++bpkg.bindist.archive:--archive-build-meta=
+bpkg.bindist.archive:config.install.relocatable=true
+
+bbot.sys-install.tar.extract:--directory=$~
+bbot.sys-install.tar.extract:--strip-components=1
+b.test-installed.configure:config.cc.loptions='-L$~/usr/local/lib'
+bpkg.test-separate-installed.create:config.cc.loptions='-L$~/usr/local/lib'
+
+bpkg.create:config.bin.rpath=[null]
+\\"
+config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\""
++export LD_LIBRARY_PATH="$~/usr/local/lib:$getenv('LD_LIBRARY_PATH')"
+#\
#\
package_config = 'package-config:
\
@@ -71,9 +99,6 @@ package_config = 'package-config:
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:
@@ -141,6 +166,17 @@ host = 'host: true'
#package_config = 'package-config: config.libbuild2-kconfig.develop=true'
#package_config = 'package-config: -bpkg.install:'
#\
+package_config = "package-config:
+\\
++bpkg.bindist.archive:--archive-build-meta=
+bbot.sys-install.tar.extract:--directory=$~
+bbot.sys-install.tar.extract:--strip-components=1
+bpkg.create:config.bin.rpath=[null]
+\\"
+config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\""
++export LD_LIBRARY_PATH="$~/usr/local/lib:$getenv('LD_LIBRARY_PATH')"
+#\
+#\
package_config = 'package-config:
\
+bpkg.bindist.fedora:
@@ -197,7 +233,17 @@ tests="tests: * cli-tests == $ver
examples: * cli-examples == $ver"
host='host: true'
#\
-#package_config = 'package-config: -bpkg.install:'
+#\
+package_config = "package-config:
+\\
++bpkg.bindist.archive:--archive-build-meta=
+bbot.sys-install.tar.extract:--directory=$~
+bbot.sys-install.tar.extract:--strip-components=1
+bpkg.create:config.bin.rpath=[null]
+\\"
+config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\""
++export LD_LIBRARY_PATH="$~/usr/local/lib:$getenv('LD_LIBRARY_PATH')"
+#\
#\
package_config = 'package-config:
\
@@ -206,6 +252,7 @@ bpkg.create:config.bin.rpath=[null]
\'
#\
#package_config = 'package-config: ?libcutl +{ config.libcutl.develop=true }'
+#package_config = 'package-config: -bpkg.install:'
#\
pkg = libxsd
@@ -232,6 +279,18 @@ examples: * xsd-examples == $ver"
host='host: true'
#\
#\
+package_config = "package-config:
+\\
+?sys:libxerces-c --sys-install --sys-yes
++bpkg.bindist.archive:--archive-build-meta=
+bbot.sys-install.tar.extract:--directory=$~
+bbot.sys-install.tar.extract:--strip-components=1
+bpkg.create:config.bin.rpath=[null]
+\\"
+config = "$config bpkg.create:config.install.root=\"'$~/usr/local'\""
++export LD_LIBRARY_PATH="$~/usr/local/lib:$getenv('LD_LIBRARY_PATH')"
+#\
+#\
package_config = 'package-config:
\
?sys:libxerces-c --sys-install --sys-yes
@@ -299,18 +358,6 @@ rep_type = git
rfp = yes
#\
-# Note that we also need to make sure that the installed package libraries are
-# properly imported when configuring and running tests, and that the installed
-# executables are runnable.
-#
-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-separate-installed.create:\"config.cc.loptions=-L'$~/install/lib'\""
-
#interactive="interactive: b.test-installed.configure"
#interactive="interactive: warning"
@@ -379,5 +426,6 @@ a = $0
&?dist/*** &?redist/*** &?bindist/*** \
&?dist-install/*** &?redist-install/*** \
&?dist-installed/*** &?redist-installed/*** \
+ &?../usr/*** \
&task.manifest <| 2>|
}