diff options
Diffstat (limited to 'tests/test/script/integration/testscript')
| -rw-r--r-- | tests/test/script/integration/testscript | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript index 7cd8f0a..495c75a 100644 --- a/tests/test/script/integration/testscript +++ b/tests/test/script/integration/testscript @@ -8,28 +8,25 @@ .include ../../common.test -cd = [string] $path.canonicalize(./) -td = [string] $path.canonicalize(test/) - -: scrip-files +: script-files : { +touch testscript foo.test bar.test : testscript-and-other : - $* <<EOI 2>>"EOE" != 0 + $* <<EOI 2>>~%EOE% != 0 ./: test{../testscript ../foo} EOI - error: both 'testscript' and other names specified for dir{$cd} + %error: both 'testscript' and other names specified for dir\{\.[/\\]\}% EOE : other-and-testscript : - $* <<EOI 2>>"EOE" != 0 + $* <<EOI 2>>~%EOE% != 0 ./: test{../foo ../testscript} EOI - error: both 'testscript' and other names specified for dir{$cd} + %error: both 'testscript' and other names specified for dir\{\.[/\\]\}% EOE : others @@ -43,20 +40,20 @@ td = [string] $path.canonicalize(test/) : touch foo.test; touch test; -$* <<EOI 2>>"EOE" != 0 +$* <<EOI 2>>~%EOE% != 0 ./: test{foo} EOI -error: working directory $td is a file/symlink +%error: working directory test[/\\] is a file/symlink% EOE : wd-exists-before : touch foo.test; mkdir test &!test/; -$* <<EOI 2>>"EOE" +$* <<EOI 2>>~%EOE% ./: test{foo} EOI -warning: working directory $td exists at the beginning of the test +%warning: working directory test[/\\] exists at the beginning of the test% EOE : wd-not-empty-before @@ -64,10 +61,10 @@ EOE touch foo.test; mkdir test &!test/; touch test/dummy &!test/dummy; -$* <<EOI 2>>"EOE" +$* <<EOI 2>>~%EOE% ./: test{foo} EOI -warning: working directory $td exists and is not empty at the beginning of the test +%warning: working directory test[/\\] exists and is not empty at the beginning of the test% EOE : wd-not-empty-after @@ -81,8 +78,8 @@ EOE cat <<EOI >>>foo.test; touch ../../dummy EOI -$* <<EOI 2>>"EOE" &test/*** != 0 +$* <<EOI 2>>~%EOE% &test/*** != 0 ./: test{foo} EOI -error: working directory $td is not empty at the end of the test +%error: working directory test[/\\] is not empty at the end of the test% EOE |