diff options
Diffstat (limited to 'tests/test/script/runner/timeout.testscript')
| -rw-r--r-- | tests/test/script/runner/timeout.testscript | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/tests/test/script/runner/timeout.testscript b/tests/test/script/runner/timeout.testscript index bf39034..f9b6ec7 100644 --- a/tests/test/script/runner/timeout.testscript +++ b/tests/test/script/runner/timeout.testscript @@ -54,14 +54,14 @@ : missing : $c <'timeout' && $b 2>>~%EOE% != 0 - testscript:1:1: error: missing timeout + testscript:1:1: error: timeout: missing timeout %. EOE : invalid : $c <'timeout foo' && $b 2>>~%EOE% != 0 - testscript:1:1: error: invalid test fragment timeout 'foo' + testscript:1:1: error: timeout: invalid test fragment timeout 'foo' %. EOE } @@ -121,7 +121,7 @@ +timeout foo/ } EOI - testscript:2:4: error: invalid test group timeout 'foo' + testscript:2:4: error: timeout: invalid test group timeout 'foo' %. EOE } @@ -176,7 +176,7 @@ +timeout /foo } EOI - testscript:2:4: error: invalid test timeout 'foo' + testscript:2:4: error: timeout: invalid test timeout 'foo' %. EOE } @@ -229,7 +229,7 @@ $c <<EOI && $b 2>>~%EOE% != 0 +timeout foo/ EOI - testscript:1:2: error: invalid testscript timeout 'foo' + testscript:1:2: error: timeout: invalid testscript timeout 'foo' %. EOE @@ -300,7 +300,7 @@ +timeout /foo } EOI - testscript:2:4: error: invalid test timeout 'foo' + testscript:2:4: error: timeout: invalid test timeout 'foo' %. EOE } @@ -424,7 +424,9 @@ $c <<EOI && $b 2>>~%EOE% != 0 env -t 1 -- $* -l 86400 -o 'foo' | touch $~/foo/bar EOI - %testscript:.*: error: touch exited with code 1% + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% + %. + %testscript:.*: error: builtin touch exited with code 1% %.+ EOE } @@ -435,42 +437,54 @@ : prog-tm-prog : $c <'$* -l 10 | env -t 1 -- $* -i 0' && $b 2>>~%EOE% != 0 - %testscript:.*: error: .+driver.* terminated: execution timeout expired% + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% + %. + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% %. EOE : tm-prog-prog : $c <'env -t 1 -- $* -l 10 | $* -i 0' && $b 2>>~%EOE% != 0 - %testscript:.*: error: .+driver.* terminated: execution timeout expired% + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% + %. + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% %. EOE : tm-cat-prog : - $c <'env -t 1 -- cat <"test" | $* -l 10' && $b 2>>~%EOE% != 0 - %testscript:.*: error: cat terminated: execution timeout expired% + $c <'env -t 3 -- cat <"test" | $* -l 10' && $b 2>>~%EOE% != 0 + %testscript:.*: error: builtin cat terminated: execution timeout expired% + %. + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% %. EOE : cat-tm-prog : $c <'cat <"test" | env -t 1 -- $* -l 10' && $b 2>>~%EOE% != 0 - %testscript:.*: error: .+driver.* terminated: execution timeout expired% + %testscript:.*: error: builtin cat terminated: execution timeout expired% + %. + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% %. EOE : tm-prog-cat : $c <'env -t 1 -- $* -l 10 | cat >-' && $b 2>>~%EOE% != 0 - %testscript:.*: error: .+driver.* terminated: execution timeout expired% + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% + %. + %testscript:.*: error: builtin cat terminated: execution timeout expired% %. EOE : tm-echo-prog : - $c <'env -t 1 -- echo "test" | $* -l 10' && $b 2>>~%EOE% != 0 - %testscript:.*: error: echo terminated: execution timeout expired% + $c <'env -t 3 -- echo "test" | $* -l 10' && $b 2>>~%EOE% != 0 + %testscript:.*: error: builtin echo terminated: execution timeout expired% + %. + %testscript:.*: error: process .+driver.* terminated: execution timeout expired% %. EOE |