3 files changed, 20 insertions, 1 deletions
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx
index c5fd24e..c7d7a1d 100644
--- a/tests/buildtab/driver.cxx
+++ b/tests/buildtab/driver.cxx
@@ -32,6 +32,9 @@ try
   {
     cout << c.machine_pattern << ' ' << c.name << ' ' << c.target;
 
+    if (c.environment)
+      cout << '/' << *c.environment;
+
     string classes;
     for (const string& cls: c.classes)
     {
diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript
index 0572335..e2bd2bc 100644
--- a/tests/buildtab/testscript
+++ b/tests/buildtab/testscript
@@ -19,6 +19,8 @@
   linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3    x86_64-linux-gnu "all default linux gcc           gcc-7+:gcc-6+"
   linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3-O3 x86_64-linux-gnu "all default linux gcc optimized gcc-7+" config.cc.coptions=-O3
   linux_debian_9*-gcc_8.1 linux_debian_9-gcc_8.1    x86_64-linux-gnu "all default linux gcc           gcc-8+:gcc-7+"
+
+  windows_10*-clang_9.0_msvc_16.3 windows_10-clang_9.0_msvc_16.3_lld x86_64-microsoft-win32-msvc14.2/lld  "all default windows clang"
   EOI
   windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 all
   windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: "
@@ -26,6 +28,7 @@
   linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3 x86_64-linux-gnu "all default linux gcc gcc-7+:gcc-6+"
   linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3-O3 x86_64-linux-gnu "all default linux gcc optimized gcc-7+:gcc-6+" config.cc.coptions=-O3
   linux_debian_9*-gcc_8.1 linux_debian_9-gcc_8.1 x86_64-linux-gnu "all default linux gcc gcc-8+:gcc-7+"
+  windows_10*-clang_9.0_msvc_16.3 windows_10-clang_9.0_msvc_16.3_lld x86_64-microsoft-win32-msvc14.2/lld "all default windows clang"
   EOO
 
   : empty-lines
@@ -81,6 +84,18 @@
       EOE
   }
 
+  : environment
+  :
+  {
+    : empty
+    :
+    $* <<EOI 2>>EOE == 1
+      windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0/
+      EOI
+      cin:1:34: error: empty environment
+      EOE
+  }
+
   : class
   :
   {
diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript
index d1ea642..9852f91 100644
--- a/tests/manifest/task.testscript
+++ b/tests/manifest/task.testscript
@@ -20,11 +20,12 @@ test.options += -t
   8:64:3C:73:60:F8:66:3A:A4
   machine: windows_10-msvc_14
   target: x86_64-microsoft-win32-msvc14.0
+  environment: lld
   config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
   warning-regex: '^warning: ' '^.+: warning: '
   EOF
 
-  : no-config-no-regex
+  : no-config-regex-environment
   :
   $* <<EOF >>EOF
   : 1