From a6b270a6e0116f2975f05dc9db731885f956bdc6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 29 Oct 2019 19:00:12 +0300
Subject: Use environment task manifest value to locate environment setup
 executable

---
 tests/integration/testscript | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tests/integration/testscript')

diff --git a/tests/integration/testscript b/tests/integration/testscript
index 7692436..2e7deb2 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -27,6 +27,7 @@ sudo /usr/sbin/in.tftpd \
 
 machine = linux-gcc
 target = x86_64-linux-gnu
+environment =
 c   = gcc
 cxx = g++
 
@@ -96,6 +97,10 @@ bpkg.test-installed.create:\"config.bin.rpath='$~/install/lib'\""
   config: $config
   EOI
 
++if ("$environment" != "")
+  echo "environment: $environment" >+task
+end
+
 #
 #
 tftp = 127.0.0.1:55123
@@ -119,7 +124,9 @@ a = $0
 : worker
 :
 {
-  cat <<"EOI" >=$target;
+  env = ("$environment" != "" ? "$environment" : "default")
+
+  cat <<"EOI" >=$env;
   #!/bin/sh
 
   t="\$1"
@@ -127,7 +134,7 @@ a = $0
 
   exec "\$@" cc config.c=$c config.cxx=$cxx
   EOI
-  chmod ugo+x $target;
+  chmod ugo+x $env;
   sleep $wait;
   $w --verbose 3 --startup --tftp-host $tftp --environments $~ \
     &build/*** &?build-installed/*** &?build-tests-installed/*** \
-- 
cgit v1.1