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

---
 unit-tests/function/buildfile              | 4 ++--
 unit-tests/test/script/parser/buildfile    | 4 ++--
 unit-tests/test/script/parser/include.test | 4 ++--
 unit-tests/test/script/parser/scope.test   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'unit-tests')

diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile
index 756fbcd..c297ed8 100644
--- a/unit-tests/function/buildfile
+++ b/unit-tests/function/buildfile
@@ -7,8 +7,8 @@
 import libs = libbutl%lib{butl}
 src = token lexer diagnostics utility variable name b-options types-parsers \
 context scope parser target operation rule prerequisite file module function \
-functions-builtin functions-path functions-process-path algorithm search dump \
-filesystem config/{utility init operation}
+functions-builtin functions-path functions-process-path functions-string \
+algorithm search dump filesystem config/{utility init operation}
 
 exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs test{call syntax}
 
diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile
index 6cc319a..b570901 100644
--- a/unit-tests/test/script/parser/buildfile
+++ b/unit-tests/test/script/parser/buildfile
@@ -8,8 +8,8 @@ import libs = libbutl%lib{butl}
 src = token lexer parser diagnostics utility variable name context target \
 scope prerequisite file module operation rule b-options algorithm search \
 filesystem function functions-builtin functions-path functions-process-path \
-config/{utility init operation} dump types-parsers test/{target \
-script/{token lexer parser script}}
+functions-string config/{utility init operation} dump types-parsers \
+test/{target script/{token lexer parser script}}
 
 exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \
 test{cleanup command-if command-re-parse description exit expansion \
diff --git a/unit-tests/test/script/parser/include.test b/unit-tests/test/script/parser/include.test
index 7a3b517..1639d37 100644
--- a/unit-tests/test/script/parser/include.test
+++ b/unit-tests/test/script/parser/include.test
@@ -104,11 +104,11 @@ EOO
 
 : var-expansion
 :
-cat <<EOI >>>foo-$(build.version).test;
+cat <<EOI >>>"foo-$(build.version).test";
 cmd
 EOI
 $* <<EOI >>EOO
-.include foo-$(build.version).test
+.include "foo-$(build.version).test"
 EOI
 cmd
 EOO
diff --git a/unit-tests/test/script/parser/scope.test b/unit-tests/test/script/parser/scope.test
index 6ddb265..44aebee 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.test
@@ -4,13 +4,13 @@ $* foo.test   <'cmd $@' >"cmd foo/1" # id
 wd = [dir_path] $~;
 wd += test-driver;
 wd += 1;
-$* testscript <'cmd $~' >"cmd $wd"   # wd-testscript
+$* testscript <'cmd "$~"' >"cmd $wd"   # wd-testscript
 
 wd = [dir_path] $~;
 wd += test-driver;
 wd += foo;
 wd += 1;
-$* foo.test   <'cmd $~' >"cmd $wd"   # wd
+$* foo.test   <'cmd "$~"' >"cmd $wd"   # wd
 
 $* -s <<EOI                          # group-empty
 {
-- 
cgit v1.1