aboutsummaryrefslogtreecommitdiff
path: root/tests/test/script-integration
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-01-11 01:43:09 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-01-19 17:56:07 +0300
commita83f3866667bca073c4d4c5d80b4deb5ac05906c (patch)
tree479464203f6be4535c8f165a20d21322a88a2751 /tests/test/script-integration
parentba99b60aeb8ccdeffc777589b99728395cd28f95 (diff)
Add support for portable path modifer and dot character escaping inversion
Diffstat (limited to 'tests/test/script-integration')
-rw-r--r--tests/test/script-integration/testscript23
1 files changed, 13 insertions, 10 deletions
diff --git a/tests/test/script-integration/testscript b/tests/test/script-integration/testscript
index 914ff30..f102f5b 100644
--- a/tests/test/script-integration/testscript
+++ b/tests/test/script-integration/testscript
@@ -11,18 +11,18 @@
: testscript-and-other
:
- $* <<EOI 2>>~%EOE% != 0
+ $* <<EOI 2>>/EOE != 0
./: test{../testscript ../foo}
EOI
- %error: both 'testscript' and other names specified for dir\{\.[/\\]\}%
+ 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\{\.[/\\]\}%
+ error: both 'testscript' and other names specified for dir{./}
EOE
: others
@@ -34,6 +34,9 @@
: wd-is-file
:
+: Note that here we can not use portable path modifier as not all slashes are
+: path separators.
+:
touch foo.test;
touch test;
$* <<EOI 2>>~%EOE% != 0
@@ -46,10 +49,10 @@ EOE
:
touch foo.test;
mkdir test &!test/;
-$* <<EOI 2>>~%EOE%
+$* <<EOI 2>>/EOE
./: test{foo}
EOI
-%warning: working directory test[/\\] exists at the beginning of the test%
+warning: working directory test/ exists at the beginning of the test
EOE
: wd-not-empty-before
@@ -57,10 +60,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 test[/\\] 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
@@ -74,8 +77,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 test[/\\] is not empty at the end of the test%
+error: working directory test/ is not empty at the end of the test
EOE