diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-30 17:32:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-30 17:32:43 +0200 |
| commit | be14801929cf2a6caced87df034ae12a85f42aa6 (patch) | |
| tree | 74670e0a746961424e50c09449d526e143c1abfc /unit-tests/test | |
| parent | 4b31ef06275ad423e48a75d15fb0ee21c3127e3c (diff) | |
Add support for typed/untyped concatenated expansion
Diffstat (limited to 'unit-tests/test')
| -rw-r--r-- | unit-tests/test/script/parser/buildfile | 4 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/include.test | 4 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/scope.test | 4 |
3 files changed, 6 insertions, 6 deletions
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 { |