From cf18da3ac461087ccffd31222dbe4fa2e6428d56 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 5 Nov 2019 14:58:11 +0200
Subject: Fix tests

---
 tests/function/regex/testscript | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'tests/function/regex/testscript')

diff --git a/tests/function/regex/testscript b/tests/function/regex/testscript
index 1fdb383..6ee4c4d 100644
--- a/tests/function/regex/testscript
+++ b/tests/function/regex/testscript
@@ -42,21 +42,30 @@
 
     : multiple-names
     :
-    $* <<EOI 2>'error: invalid argument: invalid string value: multiple names' != 0
+    $* <<EOI 2>>EOE != 0
     print $regex.replace(foo.cxx bar.cxx, '([^.]*)', '\1.o')
     EOI
+    error: invalid argument: invalid string value: multiple names
+      <stdin>:1:8: info: while calling regex.replace(<untyped>, <untyped>, <untyped>)
+    EOE
 
     : null
     :
-    $* <<EOI 2>'error: invalid argument: null value' != 0
+    $* <<EOI 2>>EOE != 0
     print $regex.replace([null], '([^.]*)', '\1.o')
     EOI
+    error: invalid argument: null value
+      <stdin>:1:8: info: while calling regex.replace(<untyped>, <untyped>, <untyped>)
+    EOE
 
     : null-regex
     :
-    $* <<EOI 2>'error: invalid argument: null value' != 0
+    $* <<EOI 2>>EOE != 0
     print $regex.replace(foo.cxx, [null], '\1.o')
     EOI
+    error: invalid argument: null value
+      <stdin>:1:8: info: while calling regex.replace(<untyped>, <untyped>, <untyped>)
+    EOE
   }
 
   : no-subs
@@ -104,15 +113,19 @@
 
     : unknown
     :
-    $* <<EOI 2>"error: invalid argument: invalid flag 'unknown'" != 0
+    $* <<EOI 2>>EOE != 0
     print $regex.replace("foo.cxx", '(f[^.]*).*', '\1.o', unknown)
     EOI
+    error: invalid argument: invalid flag 'unknown'
+      <stdin>:1:8: info: while calling regex.replace(<untyped>, <untyped>, <untyped>, <untyped>)
+    EOE
   }
 
   : invalid-regex
   :
   $* <'print $regex.replace(a, "[", b)' 2>>~/EOE/ != 0
   /error: invalid argument: invalid regex '\['.*/
+    <stdin>:1:8: info: while calling regex.replace(<untyped>, <untyped>, <untyped>)
   EOE
 }
 
-- 
cgit v1.1