From 9e2b4fd3bbc0c61bf6c84540c52869ec7d830718 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 6 Jan 2017 03:24:33 +0300
Subject: Make use of operator<<(ostream, exception)

---
 tests/test/script/builtin/cat.test   | 4 ----
 tests/test/script/builtin/mkdir.test | 8 --------
 tests/test/script/builtin/rm.test    | 4 ----
 3 files changed, 16 deletions(-)

(limited to 'tests/test/script/builtin')

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
-- 
cgit v1.1