aboutsummaryrefslogtreecommitdiff
path: root/unit-tests/test/script
diff options
context:
space:
mode:
Diffstat (limited to 'unit-tests/test/script')
-rw-r--r--unit-tests/test/script/lexer/driver.cxx3
-rw-r--r--unit-tests/test/script/parser/command-if.test2
-rw-r--r--unit-tests/test/script/parser/command-re-parse.test4
-rw-r--r--unit-tests/test/script/parser/description.test4
-rw-r--r--unit-tests/test/script/parser/expansion.test2
-rw-r--r--unit-tests/test/script/parser/here-document.test10
-rw-r--r--unit-tests/test/script/parser/include.test4
-rw-r--r--unit-tests/test/script/parser/scope.test10
8 files changed, 20 insertions, 19 deletions
diff --git a/unit-tests/test/script/lexer/driver.cxx b/unit-tests/test/script/lexer/driver.cxx
index abd32ba..3709191 100644
--- a/unit-tests/test/script/lexer/driver.cxx
+++ b/unit-tests/test/script/lexer/driver.cxx
@@ -34,7 +34,8 @@ namespace build2
else if (s == "second-token") m = lexer_mode::second_token;
else if (s == "variable-line") m = lexer_mode::variable_line;
else if (s == "command-line") m = lexer_mode::command_line;
- else if (s == "here-line") m = lexer_mode::here_line;
+ else if (s == "here-line-single") m = lexer_mode::here_line_single;
+ else if (s == "here-line-double") m = lexer_mode::here_line_double;
else if (s == "description-line") m = lexer_mode::description_line;
else if (s == "variable") m = lexer_mode::variable;
else assert (false);
diff --git a/unit-tests/test/script/parser/command-if.test b/unit-tests/test/script/parser/command-if.test
index 88cc7d6..4bbc016 100644
--- a/unit-tests/test/script/parser/command-if.test
+++ b/unit-tests/test/script/parser/command-if.test
@@ -249,7 +249,7 @@ if true
else
x = bar
end;
-cmd \$x
+cmd $x
EOI
? true
cmd foo
diff --git a/unit-tests/test/script/parser/command-re-parse.test b/unit-tests/test/script/parser/command-re-parse.test
index aee4f78..335ff69 100644
--- a/unit-tests/test/script/parser/command-re-parse.test
+++ b/unit-tests/test/script/parser/command-re-parse.test
@@ -2,8 +2,8 @@
# double-quote
#
$* <<EOI >>EOO
-x = cmd \\">-\\" "'<-'"
-\$x
+x = cmd \">-\" "'<-'"
+$x
EOI
cmd '>-' '<-'
EOO
diff --git a/unit-tests/test/script/parser/description.test b/unit-tests/test/script/parser/description.test
index 1b3f358..b4ab435 100644
--- a/unit-tests/test/script/parser/description.test
+++ b/unit-tests/test/script/parser/description.test
@@ -180,7 +180,7 @@ EOE
$* <<EOI >>EOO # legal-var
: foo bar
x = y;
-cmd \$x
+cmd $x
EOI
: sm:foo bar
cmd y
@@ -334,7 +334,7 @@ EOO
:
: No merge since test has description.
:
-$* -s -i <<EOI >>EOO #
+$* -s -i <<EOI >>EOO #
{
: foo-bar
: foo bar
diff --git a/unit-tests/test/script/parser/expansion.test b/unit-tests/test/script/parser/expansion.test
index c23d598..1d10a63 100644
--- a/unit-tests/test/script/parser/expansion.test
+++ b/unit-tests/test/script/parser/expansion.test
@@ -6,7 +6,7 @@
$* <<EOI >>EOO
x = dir/ proj% proj%name proj%proj%dir/type{name name {name}}
cmd dir/ proj% proj%name proj%proj%dir/type{name name {name}}
-cmd \$x
+cmd $x
EOI
cmd dir/ proj% proj%name proj%proj%dir/type{name name {name}}
cmd dir/ proj% proj%name proj%proj%dir/type{name name {name}}
diff --git a/unit-tests/test/script/parser/here-document.test b/unit-tests/test/script/parser/here-document.test
index 6f26166..7cb9474 100644
--- a/unit-tests/test/script/parser/here-document.test
+++ b/unit-tests/test/script/parser/here-document.test
@@ -128,8 +128,8 @@
:
$* <<EOI >>EOO
x = foo bar
- cmd <<EOF
- \$x
+ cmd <<"EOF"
+ $x
EOF
EOI
cmd <<EOF
@@ -142,8 +142,8 @@
:
$* <<EOI >>EOO
x = foo
- cmd <<EOF
- \$x bar \$x
+ cmd <<"EOF"
+ $x bar $x
EOF
EOI
cmd <<EOF
@@ -185,7 +185,7 @@ EOO
: Note: they are still recognized in eval contexts.
:
$* <<EOI >>EOO
-cmd <<EOF
+cmd <<"EOF"
'single'
"double"
b'o't"h"
diff --git a/unit-tests/test/script/parser/include.test b/unit-tests/test/script/parser/include.test
index 65ce7ce..7a3b517 100644
--- a/unit-tests/test/script/parser/include.test
+++ b/unit-tests/test/script/parser/include.test
@@ -14,7 +14,7 @@ EOO
touch foo.test;
$* <<EOI
x = foo.test
-.include\$x
+.include$x
EOI
: none
@@ -108,7 +108,7 @@ 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 3b10d01..6ddb265 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.test
@@ -74,7 +74,7 @@ EOO
$* -s -i <<EOI >>EOO # test-scope-var
{
x = abc
- cmd \$x
+ cmd $x
}
EOI
{
@@ -88,7 +88,7 @@ $* -s -i <<EOI >>EOO # test-scope-setup
{
x = abc
+setup
- cmd \$x
+ cmd $x
}
EOI
{
@@ -166,7 +166,7 @@ EOO
$* -s <<EOI >>EOO # test-var
cmd1;
x = abc;
-cmd2 \$x
+cmd2 $x
EOI
{
{
@@ -178,7 +178,7 @@ EOO
$* -s <<EOI >>EOO # test-var-first
x = abc;
-cmd \$x
+cmd $x
EOI
{
{
@@ -189,7 +189,7 @@ EOO
$* -s <<EOI >>EOO # var-setup-tdown
x = abc
-cmd \$x
+cmd $x
y = 123
EOI
{