aboutsummaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/testscript29
1 files changed, 27 insertions, 2 deletions
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 2ae3b3c..6084d32 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -48,10 +48,34 @@ controller = https://stage.build2.org/?build-task
wait=1s
controller = --fake-request ../task --dump-result
-pkg = hello
+pkg = libhello
ver = 1.0.0
rep = https://build2.org/pkg/1/hello/stable
rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94
+
+#\
+pkg = bpkg
+ver = 0.6.0-a.0.1499870184.53fff46c5e5fd4df
+rep = https://stage.build2.org/1
+rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65
+#\
+
+#\
+pkg = build2
+ver = 0.6.0-a.0.1500478402.30578be48463b93f
+rep = https://stage.build2.org/1
+rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65
+#\
+
+# 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 = "config.install.root='$~/install' \
+config.cc.poptions=-I'$~/install/include' \
+config.cc.loptions=-L'$~/install/lib' \
+config.bin.rpath='$~/install/lib'"
+
+cat <<"EOI" >=task
: 1
name: $pkg
@@ -60,6 +84,7 @@ rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30
trust: $rfp
machine: $machine
target: $target
+ config: $config
EOI
#
@@ -96,5 +121,5 @@ a = $0
chmod ugo+x $target;
sleep $wait;
$w --verbose 3 --startup --tftp-host $tftp --environments $~ \
- &build/*** &manifest 2>|
+ &build/*** &?build-installed/*** &manifest 2>|
}