From 8e8d599b129d35f638f2c1957c869b054a38b021 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 13 Jul 2017 22:19:18 +0300 Subject: Make tests to be a sub-project --- tests/integration/buildfile | 9 ++++++--- tests/integration/testscript | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'tests/integration') diff --git a/tests/integration/buildfile b/tests/integration/buildfile index f054694..2f33955 100644 --- a/tests/integration/buildfile +++ b/tests/integration/buildfile @@ -2,7 +2,10 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : TBC; see accompanying LICENSE file -./: ../../bbot/exe{bbot-agent bbot-worker} test{testscript} file{tftp-map} -dir{./}: test = ../../bbot/exe{bbot-agent} +# Setup the bbot-agent and bbot-worker that we are testing. +# +import agent = bbot%exe{bbot-agent} +import worker = bbot%exe{bbot-worker} -include ../../bbot/ +./: test{testscript} file{tftp-map} $agent $worker +dir{./}: test = $agent diff --git a/tests/integration/testscript b/tests/integration/testscript index bf66324..fcb3b19 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -49,7 +49,7 @@ controller = --fake-request ../task --dump-result pkg = hello ver = 1.0.0 -rep = https://build2.org/pkg/1/stage/stable +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 +cat <<"EOI" >=task : 1 -- cgit v1.1