From be14801929cf2a6caced87df034ae12a85f42aa6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 30 Nov 2016 17:32:43 +0200
Subject: Add support for typed/untyped concatenated expansion

---
 tests/function/path/testscript        | 4 ++--
 tests/test/script/runner/cleanup.test | 2 +-
 tests/test/script/runner/status.test  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/function/path/testscript b/tests/function/path/testscript
index 0f83ad6..fc1cb31 100644
--- a/tests/function/path/testscript
+++ b/tests/function/path/testscript
@@ -19,8 +19,8 @@ end
 : normalize
 :
 {
-  $* <'print $normalize([path] a/../b/)'             >"b"        : path
-  $* <'print $normalize([paths] a/../b/ a/../c)'     >"b c"      : paths
+  $* <'print $normalize([path] a/../b)'              >"b"        : path
+  $* <'print $normalize([paths] a/../b a/../c)'      >"b c"      : paths
   $* <'print $normalize([dir_path] a/../b)'          >"b$s"      : dir-path
   $* <'print $normalize([dir_paths] a/../b a/../c/)' >"b$s c$s"  : dir-paths
   $* <'print $path.normalize(a/../b)'                >"b"        : untyped
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index e6cefd5..e5d917d 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -13,7 +13,7 @@ EOI
 b = $effect($build.path) -q --no-column --buildfile - <"./: test{testscript}" \
   &?test/*** test
 c = cat >>>testscript
-test = \'$test\'
+test = "'$test'"
 
 # Valid cleanups.
 #
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test
index 716f2d4..4998311 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.test
@@ -13,7 +13,7 @@ EOI
 b = $effect($build.path) -q --no-column --buildfile - <"./: test{testscript}" \
   &?test/*** test
 c = cat >>>testscript
-test = \'$test\'
+test = "'$test'"
 
 +if ($cxx.target.class == "windows")
   ext = ".exe"
-- 
cgit v1.1