diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-10-21 09:10:36 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:34 +0200 |
| commit | 658731ac32fa2e06a9f2b1a8cfffc65090f9373e (patch) | |
| tree | f20e22b9fa636d9274dfc31c2ffc3471d9cb6a70 /unit-tests/test/script | |
| parent | 89424b41ef62430a49012c5c57b1979f29029505 (diff) | |
Minor testscript changes
Diffstat (limited to 'unit-tests/test/script')
| -rw-r--r-- | unit-tests/test/script/lexer/script-line.test | 40 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/buildfile | 3 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/command-re-parse.test | 2 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/here-document.test | 2 |
4 files changed, 4 insertions, 43 deletions
diff --git a/unit-tests/test/script/lexer/script-line.test b/unit-tests/test/script/lexer/script-line.test deleted file mode 100644 index 64d7c18..0000000 --- a/unit-tests/test/script/lexer/script-line.test +++ /dev/null @@ -1,40 +0,0 @@ -foo != 0 -a=aaa -foo bar <"bbb $a ccc" >ddd 2>>EOE == 2 -eee -EOE -foo -bar -$cxx.target.class -foo = baz -$foo -fox = $foo-$cxx.target.class -$fox -$test -$~ -$* -$0 -test = xxx -$0 -$* -test.options += --foo -$1 -$* -test.arguments += bar -$2 -$* -($3 == [null]) - -x = [uint64] 001 -foo $x -cmd abc$(x)23 -cmd >>EOO << EOI -foo -$x -bar -EOO -$x$x$x -EOI - -y = >> -cmd "2"$y diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile index 56a4682..af602b1 100644 --- a/unit-tests/test/script/parser/buildfile +++ b/unit-tests/test/script/parser/buildfile @@ -10,6 +10,7 @@ scope prerequisite file module operation rule b-options algorithm search \ filesystem config/{utility init operation} dump types-parsers \ test/{target script/{token lexer parser script}} -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs #test{testscript} +exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \ +test{pre-parse expansion here-document command-re-parse} include ../../../../build2/ diff --git a/unit-tests/test/script/parser/command-re-parse.test b/unit-tests/test/script/parser/command-re-parse.test index 956052d..5ea2284 100644 --- a/unit-tests/test/script/parser/command-re-parse.test +++ b/unit-tests/test/script/parser/command-re-parse.test @@ -3,7 +3,7 @@ # $* <<EOI >>EOO x = cmd \\">!\\" "'<!'" -$x +\$x EOI cmd ">!" "<!" EOO diff --git a/unit-tests/test/script/parser/here-document.test b/unit-tests/test/script/parser/here-document.test index 7cfa8d4..13b070a 100644 --- a/unit-tests/test/script/parser/here-document.test +++ b/unit-tests/test/script/parser/here-document.test @@ -15,6 +15,6 @@ cmd <<EOF 'single' "double" b'o't"h" -'single' "double" +single double EOF EOO |