2 files changed, 36 insertions, 20 deletions
diff --git a/tests/manifest/result.testscript b/tests/manifest/result.testscript
index b48a691..728b5f9 100644
--- a/tests/manifest/result.testscript
+++ b/tests/manifest/result.testscript
@@ -18,15 +18,18 @@ test.options += -r
   configure-status: success
   update-status: warning
   test-status: error
-  configure-log:\
+  configure-log:
+  \
   conf line 1
   conf line 2
   \
-  update-log:\
+  update-log:
+  \
   update line 1
   update line 2
   \
-  test-log:\
+  test-log:
+  \
   test line 1
   test line 2
   \
@@ -43,11 +46,13 @@ test.options += -r
   status: error
   configure-status: warning
   update-status: error
-  configure-log:\
+  configure-log:
+  \
   conf line 1
   conf line 2
   \
-  update-log:\
+  update-log:
+  \
   update line 1
   update line 2
   \
diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript
index 8320f59..d901dc4 100644
--- a/tests/manifest/task.testscript
+++ b/tests/manifest/task.testscript
@@ -26,7 +26,8 @@ test.options += -t
   auxiliary-machine: x86_64-linux_debian_12-mysql*
   target: x86_64-microsoft-win32-msvc14.0
   environment: lld
-  auxiliary-environment:\
+  auxiliary-environment:
+  \
   PGSQL_DATABASE_HOST=192.168.0.1
   PGSQL_DATABASE_PORT=1245
   \
@@ -37,8 +38,6 @@ test.options += -t
   worker-checksum: 1
   EOF
 
-  # @@ TMP Remove when toolchain 0.16.0 is released.
-  #
   : no-package-config
   :
   $* <<EOF >>EOF
@@ -55,7 +54,7 @@ test.options += -t
   machine: windows_10-msvc_14
   target: x86_64-microsoft-win32-msvc14.0
   environment: lld
-  config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
+  target-config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
   warning-regex: '^warning: ' '^.+: warning: '
   interactive: error
   worker-checksum: 1
@@ -161,7 +160,7 @@ test.options += -t
     repository-url: http://pkg.example.org/1/math
     machine: windows
     target: x86_64-microsoft-win32-msvc14.0
-    config: abc=
+    target-config: abc=
     EOF
 
     : var-value-quoting
@@ -173,7 +172,7 @@ test.options += -t
     repository-url: http://pkg.example.org/1/math
     machine: windows
     target: x86_64-microsoft-win32-msvc14.0
-    config: abc='a "b '"d\e x y="
+    target-config: abc='a "b '"d\e x y="
     EOF
   }
 
@@ -215,7 +214,7 @@ test.options += -t
   trust: yes
   machine: windows_10-msvc_14
   target: x86_64-microsoft-win32-msvc14.0
-  config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
+  target-config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
   EOF
 }
 
@@ -290,8 +289,8 @@ test.options += -t
   :
   $* <<EOI 2>'stdin:3:1: error: task target configuration redefinition' == 1
   : 1
-  config: config.cc.coptions=/Z7
-  config: config.cc.loptions=/DEBUG
+  target-config: config.cc.coptions=/Z7
+  target-config: config.cc.loptions=/DEBUG
   EOI
 
   : host
@@ -401,16 +400,16 @@ test.options += -t
   {
     : empty
     :
-    $* <<EOI 2>'stdin:2:8: error: empty task target configuration' == 1
+    $* <<EOI 2>'stdin:2:15: error: empty task target configuration' == 1
     : 1
-    config:
+    target-config:
     EOI
 
     : bad-field
     :
-    $* <<EOI 2>'stdin:2:15: error: invalid task configuration: unterminated quoted string' == 1
+    $* <<EOI 2>'stdin:2:22: error: invalid task configuration: unterminated quoted string' == 1
     : 1
-    config: 'abc=x
+    target-config: 'abc=x
     EOI
 
     : multiline
@@ -418,15 +417,27 @@ test.options += -t
     {
       : bad-field
       :
-      $* <<EOI 2>'stdin:3:7: error: invalid task configuration: unterminated quoted string' == 1
+      $* <<EOI 2>'stdin:4:7: error: invalid task configuration: unterminated quoted string' == 1
       : 1
-      config:\
+      target-config:
+      \
       'abc=x
       \
       EOI
     }
   }
 
+  : package-config
+  :
+  {
+    : empty
+    :
+    $* <<EOI 2>'stdin:2:16: error: empty task package configuration' == 1
+    : 1
+    package-config:
+    EOI
+  }
+
   : host
   :
   $* <<EOI 2>"stdin:2:7: error: invalid task host value 'yes'" == 1