From 3ea6e51b28a06ad4c8b70e9f4d206a56e4771027 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 22 Apr 2017 12:45:50 +0200
Subject: Rename directory/option environment to environments

To be consistent with machines/ and toolchains/
---
 tests/integration/testscript | 4 ++--
 tests/worker/startup.test    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/integration/testscript b/tests/integration/testscript
index f43bf02..bf66324 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -93,6 +93,6 @@ a = $0
   EOI
   chmod ugo+x default;
   sleep $wait;
-  $w --verbose 3 --startup --tftp-host $tftp --environment \
-    &$machine/*** &manifest $~ 2>|
+  $w --verbose 3 --startup --tftp-host $tftp --environments $~ \
+    &$machine/*** &manifest 2>|
 }
diff --git a/tests/worker/startup.test b/tests/worker/startup.test
index d13e6c5..1cf5d3c 100644
--- a/tests/worker/startup.test
+++ b/tests/worker/startup.test
@@ -42,7 +42,7 @@ cat <<EOI >=manifest;
   repository: https://pkg.example.org/1/
   machine: linux-gcc
   EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
   error: no environment setup executable in $representation($~) for target ''
   EOE
 diff -u - manifest <<EOO
@@ -68,7 +68,7 @@ cat <<EOI >=manifest;
   machine: linux-gcc
   target: x86_64-linux-gnu
   EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
   environment setup failed
   error: process $~/x86_64-linux-gnu terminated with non-zero exit code
   EOE
@@ -95,7 +95,7 @@ cat <<EOI >=manifest;
   machine: linux-gcc
   target: x86_64-linux-gnu
   EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE"
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE"
   x86_64-linux-gnu
   $0
   EOE
-- 
cgit v1.1