From 235771a20da1da0c3ff495d03e6c223880cbcf20 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 1 Oct 2020 22:08:03 +0300 Subject: Add re-distribution phase for checked out packages --- tests/integration/testscript | 50 ++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) (limited to 'tests/integration/testscript') diff --git a/tests/integration/testscript b/tests/integration/testscript index 9833491..fe76c13 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -57,6 +57,14 @@ rep_type = pkg rfp = yes #\ +pkg = hello +ver = 1.0.0+6 +rep_url = "https://git.build2.org/hello/hello.git" +rep_type = git +rfp = yes +#\ + +#\ pkg = libstudxml ver = 1.1.0-b.7.20190619110825.0d1dcfe61f15 rep_url = https://stage.build2.org/1 @@ -65,23 +73,28 @@ rfp = yes #\ #\ -pkg = hello -ver = 0.1.0-a.0.20191025174646.0150b7eb45af -rep_url = "https://github.com/karen-arutyunov/hello.git#master" +# To make sure that the test-installed phase succeeds use the build2 driver +# installed into ~/install/bin. +# +pkg = libbuild2-hello +ver = 0.1.0-a.0.20200810114133.0dba3a3bd624 +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 #\ #\ -# To make sure that the test-installed phase succeeds use the build2 driver -# installed into ~/install/bin. +# Use the build2 driver installed into ~/install/bin (see above). # -pkg = libbuild2-hello -ver = 0.1.0-a.0.20200810114133.0dba3a3bd624 -#rep_url = "https://github.com/build2/libbuild2-hello.git#master" -#rep_type = git -rep_url = https://stage.build2.org/1 -rep_type = pkg +pkg = libbuild2-kconfig +ver = 0.1.0-a.0.20200930082223.f97ea0ff51a6 +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 #\ @@ -95,9 +108,11 @@ rfp = yes #\ pkg = cli -ver = 1.2.0-b.7.20200912105851.511d78c03656 -rep_url = https://stage.build2.org/1 -rep_type = pkg +ver = 1.2.0-b.7.20200803080502.02dac36b07e8 +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 #\ @@ -163,6 +178,9 @@ a = $0 chmod ugo+x $env; sleep $wait; $w --verbose 3 --startup --tftp-host $tftp --environments $~ \ - &?build-module/*** &build/*** &?build-installed/*** \ - &?build-installed-bpkg/*** &task.manifest 2>| + &?build-module/*** &build/*** \ + &?build-installed/*** &?build-installed-bpkg/*** \ + &?dist/*** &?redist/*** \ + &?dist-installed/*** &?redist-installed/*** \ + &task.manifest 2>| } -- cgit v1.1