From b895ba115548e1ae6d17e11f7c95a895195f0e94 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 18 Jul 2017 13:31:20 +0300
Subject: Adapt to non-optional task target

---
 tests/agent/testscript       | 2 ++
 tests/integration/testscript | 8 +++++---
 tests/machine/testscript     | 6 ++++++
 tests/worker/startup.test    | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/agent/testscript b/tests/agent/testscript
index 95ca388..fb4d19a 100644
--- a/tests/agent/testscript
+++ b/tests/agent/testscript
@@ -133,6 +133,7 @@ rm = $src_base/btrfs-rmdir /build/machines
     version: 1.2.3
     repository: https://example.org/1/
     machine: windows-msvc
+    target: x86_64-microsoft-win32-msvc14.1
     EOI
     %trace: enumerate_machines:\\.*%*
     error: task from http://example.org for unknown machine windows-msvc
@@ -146,6 +147,7 @@ rm = $src_base/btrfs-rmdir /build/machines
     version: 1.2.3
     repository: https://example.org/1/
     machine: linux-gcc
+    target: x86_64-linux-gnu
     EOI
     : 1
     name: foo
diff --git a/tests/integration/testscript b/tests/integration/testscript
index fcb3b19..2ae3b3c 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -26,6 +26,7 @@ sudo /usr/sbin/in.tftpd \
 #\
 
 machine = linux-gcc
+target = x86_64-linux-gnu
 c   = gcc
 cxx = g++
 
@@ -58,6 +59,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
   repository: $rep
   trust: $rfp
   machine: $machine
+  target: $target
   EOI
 
 #
@@ -83,7 +85,7 @@ a = $0
 : worker
 :
 {
-  cat <<"EOI" >=default;
+  cat <<"EOI" >=$target;
   #!/bin/sh
 
   t="\$1"
@@ -91,8 +93,8 @@ a = $0
 
   exec "\$@" cc config.c=$c config.cxx=$cxx
   EOI
-  chmod ugo+x default;
+  chmod ugo+x $target;
   sleep $wait;
   $w --verbose 3 --startup --tftp-host $tftp --environments $~ \
-    &$machine/*** &manifest 2>|
+    &build/*** &manifest 2>|
 }
diff --git a/tests/machine/testscript b/tests/machine/testscript
index 406d9a9..b151cf5 100644
--- a/tests/machine/testscript
+++ b/tests/machine/testscript
@@ -21,6 +21,11 @@ ver = 1.0.0
 rep = https://hello.stage.build2.org/1/stable
 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
 
+# @@ There is currently no way to obtain a valid (default?) target for the
+# machine so assume it is a x86-64-bit build for something.
+#
+target = x86_64-unknown-unknown
+
 # Download the toolchain.
 #
 # Note: similar logic to what we have in Build OS.
@@ -86,4 +91,5 @@ test.options += --machines $machines --toolchain-id $checksum
   repository: $rep
   trust: $rfp
   machine: $machine
+  target: $target
   EOI
diff --git a/tests/worker/startup.test b/tests/worker/startup.test
index 1cf5d3c..f4a41de 100644
--- a/tests/worker/startup.test
+++ b/tests/worker/startup.test
@@ -41,9 +41,10 @@ cat <<EOI >=manifest;
   version: 1.2.3
   repository: https://pkg.example.org/1/
   machine: linux-gcc
+  target: x86_64-linux-gnu
   EOI
 $* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
-  error: no environment setup executable in $representation($~) for target ''
+  error: no environment setup executable in $representation($~) for target 'x86_64-linux-gnu'
   EOE
 diff -u - manifest <<EOO
   : 1
-- 
cgit v1.1