From 5007870b52aa549971824959a55ad3bb886f09e0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Sep 2018 16:37:32 +0200 Subject: Rename .test/test{} to .testscript/testscript{} --- tests/test/script/runner/redirect.test | 515 --------------------------------- 1 file changed, 515 deletions(-) delete mode 100644 tests/test/script/runner/redirect.test (limited to 'tests/test/script/runner/redirect.test') diff --git a/tests/test/script/runner/redirect.test b/tests/test/script/runner/redirect.test deleted file mode 100644 index 13d7219..0000000 --- a/tests/test/script/runner/redirect.test +++ /dev/null @@ -1,515 +0,0 @@ -# file : tests/test/script/runner/redirect.test -# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd -# license : MIT; see accompanying LICENSE file - -.include ../common.test - -b += --no-column - -ps = ($cxx.target.class != 'windows' ? '/' : '\') # Path separator. -psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex. - -: pass -: -{ - cat <'$* -i 1 -e bar <| >| 2>|' >=testscript; - cat <=buildfile; - test{testscript}: $target - EOI - $0 --serial-stop --quiet test foo 2>bar -} - -: null -: -{ - $c <'$* -o foo >-' && $b : out - $c <'$* -e foo 2>-' && $b : err -} - -: trace -: -{ - : default - : - $c <'$* -o foo -e bar >! 2>!' && $b - - : verbose - : - { - b += -v - - : out - : - $c <'$* -o foo >!' && $b >foo 2>>/~%EOE% - %test .+% - mkdir test/ - cd test/ - mkdir test/1/ - cd test/1/ - %.*/driver(.exe)? -o foo% - rmdir test/1/ - cd test/ - rmdir test/ - cd ./ - EOE - - : err - : - $c <'$* -e foo 2>!' && $b 2>>/~%EOE% - %test .+% - mkdir test/ - cd test/ - mkdir test/1/ - cd test/1/ - %.*/driver(.exe)? -e foo% - foo - rmdir test/1/ - cd test/ - rmdir test/ - cd ./ - EOE - } -} - -: str -: -{ - : literal - : - { - $c <'$* -i 0 foo' && $b : out - $c <'$* -e foo 2>foo' && $b : err - $c <'$* -i 1 foo' && $b : inout - - : inout-fail - : - $c <'$* -i 1 bar' && $b 2>>/~%EOE%d != 0 - %testscript:1: error: ../../../../../driver(.exe)? stdout doesn't match expected% - info: stdout: test/1/stdout - info: expected stdout: test/1/stdout.orig - info: stdout diff: test/1/stdout.diff - info: stdin: test/1/stdin - %--- \.*% - %\+\+\+ \.*% - %@@ \.*% - -bar - +foo - EOE - - $c <'$* -i 2 foo' && $b : inerr - $c <'$* -i 1 -e bar foo 2>bar' && $b : inout-err - $c <'$* -o "" >""' && $b : empty - $c <'$* -i 1 <:"foo" >:"foo"' && $b : no-newline - $c <'$* -i 1 <:"" >:""' && $b : no-newline-empty - - : no-newline-fail1 - : - $c <'$* -i 1 <:"foo" >"foo"' && $b 2>>~/EOE/ != 0 - /testscript:1: error: .+driver(\.exe)? stdout doesn't match expected/ - /.{7} - -foo - +foo - \ No newline at end of file - EOE - - : no-newline-fail2 - : - $c <'$* -i 1 <"foo" >:"foo"' && $b 2>>~/EOE/ != 0 - /testscript:1: error: .+driver(\.exe)? stdout doesn't match expected/ - /.{7} - -foo - \ No newline at end of file - +foo - EOE - - : merge - : - $c <>EOE 1>&2 - foo - bar - EOE - EOI - - : portable-path - : - { - $c <"\$* -i 1 'foo$ps'" && $b : in - $c <"\$* -i 1 <'foo$ps' >/'foo/'" && $b : out - $c <"\$* -i 2 <'foo$ps' 2>/'foo/'" && $b : err - } - } - - : regex - : - : Test regex matching. Note that tests that check regex parsing are located - : in regex.test testscript. - : - { - : match - : - $c <'$* -o foo >~/Foo?/i' && $b - - : mismatch - : - $c <'$* -o fooo >~/Foo?/i' && $b 2>>/~%EOE%d != 0 - %testscript:1: error: ../../../../../driver(.exe)? stdout doesn't match regex% - info: stdout: test/1/stdout - info: stdout regex: test/1/stdout.regex - fooo - EOE - - : portable-path-failure - : - : Note that we check not only build2 diagnostics being produced, but also - : the correctness of regex being saved to file (for troubleshooting). - : - { - : newline - : - $c <"\$* -i 1 <'foo' >/~%bar/%" && $b 2>>/~%EOE%d != 0; - %testscript:1: error: ../../../../../../driver(.exe)? stdout doesn't match regex% - info: stdout: test/1/stdout - info: stdout regex: test/1/stdout.regex - info: stdin: test/1/stdin - foo - EOE - cat test/1/stdout.regex >"%bar$psr%" - - : no-newline - : - $c <"\$* -i 1 <'foo' >:/~%bar/%" && $b 2>>/~%EOE%d != 0; - %testscript:1: error: ../../../../../../driver(.exe)? stdout doesn't match regex% - info: stdout: test/1/stdout - info: stdout regex: test/1/stdout.regex - info: stdin: test/1/stdin - foo - EOE - cat test/1/stdout.regex >:"%bar$psr%" - } - } -} - -: doc -: -{ - : literal - : - { - : in - : - $c <>EOO - foo - bar - EOO - EOI - - : err - : - $c <>EOO - foo - bar - EOO - EOI - - : inout - : - $c <>EOO - foo - bar - EOF - foo - bar - EOO - EOI - - : inerr - : - $c <>EOE - foo - bar - EOF - foo - bar - EOE - EOI - - : empty - : - $c <>EOO - EOF - EOO - EOI - - : shared - : - $c <>EOF - foo - bar - EOF - EOI - - : extra-newline - : - $c <>EOO - - EOF - - EOO - EOI - - : no-newline - : - $c <>:EOO - foo - EOF - foo - EOO - EOI - - : no-newline-fail1 - : - $c <>~/EOE/ != 0 - $* -i 1 <<:EOF >>EOO - foo - EOF - foo - EOO - EOI - /testscript:1: error: .+driver(\.exe)? stdout doesn't match expected/ - /.{7} - -foo - +foo - \ No newline at end of file - EOE - - : no-newline-fail2 - : - $c <>~/EOE/ != 0 - $* -i 1 <>:EOO - foo - EOF - foo - EOO - EOI - /testscript:1: error: .+driver(\.exe)? stdout doesn't match expected/ - /.{7} - -foo - \ No newline at end of file - +foo - EOE - - : no-newline-empty - : - $c <>:EOO - EOF - EOO - EOI - - : no-newline-extra-newline - : - $c <>:EOO - - EOF - - EOO - EOI - - : merge - : - $c <>EOO 2>&1 - foo - bar - EOF - foo - bar - baz - EOO - EOI - - : large-diff - : - : Make sure that the large (>4KB) expected/real output difference is not - : printed as a part of the diagnostics. - : - $c <>/~%EOE%d != 0 - s="----------------------------------------------------------------------"; - s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"; - $* -i 1 <<"EOF" >>"EOO" - $s - EOF - x$s - EOO - EOI - %testscript:3: error: ../../../../../driver(.exe)? stdout doesn't match expected% - info: stdout: test/1/stdout - info: expected stdout: test/1/stdout.orig - info: stdout diff: test/1/stdout.diff - info: stdin: test/1/stdin - EOE - - : portable-path - : - { - : in - : - $c <<"EOI" && $b - \$* -i 1 <'foo$ps' - foo/ - EOF - EOI - - : out - : - $c <<"EOI" && $b - \$* -i 1 <'foo$ps' >>/EOO - foo/ - EOO - EOI - - : err - : - $c <<"EOI" && $b - \$* -i 2 <'foo$ps' 2>>/EOE - foo/ - EOE - EOI - } - } - - : regex - : - : Test regex matching. Note that tests that check regex parsing are located - : in regex.test testscript. - : - { - : match - : - $c <>~/EOO/i - /FO*/* - bar - /* - EOO - EOI - - : match-empty - : - $c <>:~/EOO/ - /.{0} - EOO - EOI - - : shared - : - $c <>~/EOF/ 2>>~/EOF/ - foo - EOF - EOI - - : mismatch - : - $c <>/~%EOE%d != 0 - $* -o foo >>~/EOO/ - bar - EOO - EOI - %testscript:1: error: ../../../../../driver(.exe)? stdout doesn't match regex% - info: stdout: test/1/stdout - info: stdout regex: test/1/stdout.regex - foo - EOE - - : mismatch-icase - : - $c <>/~%EOE%d != 0 - $* -o foo >>~/EOO/i - bar - EOO - EOI - %testscript:1: error: ../../../../../driver(.exe)? stdout doesn't match regex% - info: stdout: test/1/stdout - info: stdout regex: test/1/stdout.regex-i - foo - EOE - } -} - -: file -: -{ - : in - : - $c <=out; - $* -i 1 <<foo - EOI - - : out - : - { - : match - : - $c <=out; - $* -e bar 2>+out; - $* -i 1 <>>out - foo - bar - EOF - EOI - - : mismatch - : - $c <>/~%EOE%d != 0 - $* -o foo >=out; - $* -o bar >>>out - EOI - %testscript:2: error: ../../../../../driver(.exe)? stdout doesn't match expected% - info: stdout: test/1/stdout-2 - info: expected stdout: test/1/out - info: stdout diff: test/1/stdout-2.diff - %--- \.*% - %\+\+\+ \.*% - %@@ \.*% - -foo - +bar - EOE - } - - : merge - : - $c <&1 >=out; - $* -e baz -o biz 1>&2 2>+out; - $* -i 1 <<>EOO - foo - bar - baz - biz - EOO - EOI -} -- cgit v1.1