aboutsummaryrefslogtreecommitdiff
path: root/tests/test/script
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-01-06 03:24:33 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-01-09 21:44:22 +0300
commit9e2b4fd3bbc0c61bf6c84540c52869ec7d830718 (patch)
tree550c9edd5b29b164d7c8c2ac13111a9491495022 /tests/test/script
parentc5d118cde064c09a416541a7f7e76d354552b2fd (diff)
Make use of operator<<(ostream, exception)
Diffstat (limited to 'tests/test/script')
-rw-r--r--tests/test/script/builtin/cat.test4
-rw-r--r--tests/test/script/builtin/mkdir.test8
-rw-r--r--tests/test/script/builtin/rm.test4
-rw-r--r--tests/test/script/runner/cleanup.test15
4 files changed, 3 insertions, 28 deletions
diff --git a/tests/test/script/builtin/cat.test b/tests/test/script/builtin/cat.test
index 39f96d0..89301cd 100644
--- a/tests/test/script/builtin/cat.test
+++ b/tests/test/script/builtin/cat.test
@@ -59,13 +59,9 @@ $b
: non-existent
:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
$c <<EOI;
cat in 2>>~%EOE% != 0
%cat: unable to print '.+[/\\]test[/\\]cat[/\\]non-existent[/\\]test[/\\]1[/\\]in': .+%
-%%?
EOE
EOI
$b
diff --git a/tests/test/script/builtin/mkdir.test b/tests/test/script/builtin/mkdir.test
index b70c1c7..8ad2714 100644
--- a/tests/test/script/builtin/mkdir.test
+++ b/tests/test/script/builtin/mkdir.test
@@ -55,13 +55,9 @@ $b
:
: Test creation of an existing directory.
:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
$c <<EOI;
mkdir a a 2>>~%EOE% == 1
%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]already-exists[/\\]test[/\\]1[/\\]a': .+%
-%%?
EOE
EOI
$b
@@ -70,13 +66,9 @@ $b
:
: Test creation of a directory with non-existent parent.
:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
$c <<EOI;
mkdir a/b 2>>~%EOE% == 1
%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]not-exists[/\\]test[/\\]1[/\\]a[/\\]b': .+%
-%%?
EOE
EOI
$b
diff --git a/tests/test/script/builtin/rm.test b/tests/test/script/builtin/rm.test
index 72b8df6..915052a 100644
--- a/tests/test/script/builtin/rm.test
+++ b/tests/test/script/builtin/rm.test
@@ -41,13 +41,9 @@ $b
:
: Removing non-existing file fails.
:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
$c <<EOI;
rm a 2>>~%EOE% == 1
%rm: unable to remove '.+[/\\]test[/\\]rm[/\\]file-not-exists[/\\]test[/\\]1[/\\]a': .+%
-%%?
EOE
EOI
$b
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index ac7c64d..3dfd73e 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -81,14 +81,11 @@ b += --no-column
: not-file
:
- : Test cleanup of a directory as a file. Note that there is an optional
- : trailing blank line in the regex that matches the newline added by msvcrt
- : as a part of the error description.
+ : Test cleanup of a directory as a file.
:
$c <'$* -d a &a';
$b 2>>~%EOE% != 0
%error: unable to remove file test[/\\]1[/\\]a: .+%
- %%?
EOE
}
@@ -156,14 +153,11 @@ b += --no-column
: not-dir
:
- : Test cleanup of a file as a directory. Note that there is an optional
- : trailing blank line in the regex that matches the newline added by msvcrt
- : as a part of the error description.
+ : Test cleanup of a file as a directory.
:
$c <'$* -f a &a/';
$b 2>>~%EOE% != 0
%error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
- %%?
EOE
}
@@ -211,14 +205,11 @@ b += --no-column
: not-dir
:
- : Test cleanup of a file as a wildcard. Note that there is an optional
- : trailing blank line in the regex that matches the newline added by msvcrt
- : as a part of the error description.
+ : Test cleanup of a file as a wildcard.
:
$c <'$* -f a &a/***';
$b 2>>~%EOE% != 0
%error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
- %%?
EOE
}