diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-12-15 12:18:15 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-12-15 12:18:15 +0200 |
commit | d79b2f8e41b2153d47319fd97625c468dbba3b40 (patch) | |
tree | 4b9b653dddd5bc46634e7b738ce010d50ea19d96 /unit-tests/test/script | |
parent | f4453f3dacef727cfd0fb8f17c47ac3eea367a34 (diff) |
Minor testscript cleanups
Diffstat (limited to 'unit-tests/test/script')
-rw-r--r-- | unit-tests/test/script/lexer/command-line.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/description-line.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/first-token.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/script-line.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/second-token.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/variable-line.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/variable.test | 2 | ||||
-rw-r--r-- | unit-tests/test/script/parser/testscript | 40 |
8 files changed, 7 insertions, 47 deletions
diff --git a/unit-tests/test/script/lexer/command-line.test b/unit-tests/test/script/lexer/command-line.test index acb7d1d..38e5954 100644 --- a/unit-tests/test/script/lexer/command-line.test +++ b/unit-tests/test/script/lexer/command-line.test @@ -1,4 +1,4 @@ -test.arguments += command-line +test.arguments = command-line $* <:"0<+" >>EOO # in-pass-redirect '0' diff --git a/unit-tests/test/script/lexer/description-line.test b/unit-tests/test/script/lexer/description-line.test index 1d317eb..0f70e77 100644 --- a/unit-tests/test/script/lexer/description-line.test +++ b/unit-tests/test/script/lexer/description-line.test @@ -1,4 +1,4 @@ -test.arguments += description-line +test.arguments = description-line $* <" foo bar " >>EOO # full ' foo bar ' diff --git a/unit-tests/test/script/lexer/first-token.test b/unit-tests/test/script/lexer/first-token.test index 456ef6d..d42e0b2 100644 --- a/unit-tests/test/script/lexer/first-token.test +++ b/unit-tests/test/script/lexer/first-token.test @@ -1,6 +1,6 @@ # Note: this mode auto-expires after each token. # -test.arguments += first-token +test.arguments = first-token $* <";" >>EOO # semi ; diff --git a/unit-tests/test/script/lexer/script-line.test b/unit-tests/test/script/lexer/script-line.test index 44f6002..7870871 100644 --- a/unit-tests/test/script/lexer/script-line.test +++ b/unit-tests/test/script/lexer/script-line.test @@ -1,4 +1,4 @@ -test.arguments += script-line +test.arguments = script-line $* <"cmd;" >>EOO # semi 'cmd' diff --git a/unit-tests/test/script/lexer/second-token.test b/unit-tests/test/script/lexer/second-token.test index 5238a82..94cdf95 100644 --- a/unit-tests/test/script/lexer/second-token.test +++ b/unit-tests/test/script/lexer/second-token.test @@ -1,6 +1,6 @@ # Note: this mode auto-expires after each token. # -test.arguments += second-token +test.arguments = second-token $* <";" >>EOO # semi ; diff --git a/unit-tests/test/script/lexer/variable-line.test b/unit-tests/test/script/lexer/variable-line.test index 543c6f9..126fe54 100644 --- a/unit-tests/test/script/lexer/variable-line.test +++ b/unit-tests/test/script/lexer/variable-line.test @@ -1,4 +1,4 @@ -test.arguments += variable-line +test.arguments = variable-line $* <"cmd;" >>EOO # semi 'cmd' diff --git a/unit-tests/test/script/lexer/variable.test b/unit-tests/test/script/lexer/variable.test index 302a8b1..0ecc6cc 100644 --- a/unit-tests/test/script/lexer/variable.test +++ b/unit-tests/test/script/lexer/variable.test @@ -1,6 +1,6 @@ # Test handling custom variable names ($*, $~, $NN). # -test.arguments += variable +test.arguments = variable $* <"*" >>EOO '*' diff --git a/unit-tests/test/script/parser/testscript b/unit-tests/test/script/parser/testscript deleted file mode 100644 index 2a9c2b9..0000000 --- a/unit-tests/test/script/parser/testscript +++ /dev/null @@ -1,40 +0,0 @@ -foo != 0 -a=aaa -foo bar <"bbb $a ccc" >ddd 2>>EOE == 2 -eee -EOE -foo -bar -cmd $build.version.string -foo = baz -$foo -fox = $foo-$build.version.string -$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 |