From 32f153664e7b6cadfb518b83e12b9768a150d709 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 9 Dec 2020 15:10:56 +0300
Subject: Prefix pseudo-builtin diagnostincs messages with their names

---
 tests/test/script/runner/exit.testscript    |  2 +-
 tests/test/script/runner/set.testscript     | 10 +++++-----
 tests/test/script/runner/timeout.testscript | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/test')

diff --git a/tests/test/script/runner/exit.testscript b/tests/test/script/runner/exit.testscript
index 24e51fa..8d3f052 100644
--- a/tests/test/script/runner/exit.testscript
+++ b/tests/test/script/runner/exit.testscript
@@ -76,7 +76,7 @@ empty_id = ''
   : unexpected
   :
   $c <'exit "foo" "bar"' && $b 2>>EOE != 0
-  testscript:1:1: error: unexpected argument 'bar'
+  testscript:1:1: error: exit: unexpected argument 'bar'
     info: test id: 1
   EOE
 }
diff --git a/tests/test/script/runner/set.testscript b/tests/test/script/runner/set.testscript
index 777eccf..e19cce3 100644
--- a/tests/test/script/runner/set.testscript
+++ b/tests/test/script/runner/set.testscript
@@ -52,7 +52,7 @@
   : both-newline-whitespace
   :
   $c <'set -nw' && $b 2>>EOE != 0
-  testscript:1:1: error: both -n|--newline and -w|--whitespace specified
+  testscript:1:1: error: set: both -n|--newline and -w|--whitespace specified
     info: test id: 1
   EOE
 }
@@ -63,28 +63,28 @@
   : none
   :
   $c <'set -e' && $b 2>>EOE != 0
-  testscript:1:1: error: missing variable name
+  testscript:1:1: error: set: missing variable name
     info: test id: 1
   EOE
 
   : unexpected
   :
   $c <'set foo bar baz' && $b 2>>EOE != 0
-  testscript:1:1: error: unexpected argument 'baz'
+  testscript:1:1: error: set: unexpected argument 'baz'
     info: test id: 1
   EOE
 
   : empty-attrs
   :
   $c <"set '' baz" && $b 2>>EOE != 0
-  testscript:1:1: error: empty variable attributes
+  testscript:1:1: error: set: empty variable attributes
     info: test id: 1
   EOE
 
   : empty-var
   :
   $c <"set ''" && $b 2>>EOE != 0
-  testscript:1:1: error: empty variable name
+  testscript:1:1: error: set: empty variable name
     info: test id: 1
   EOE
 }
diff --git a/tests/test/script/runner/timeout.testscript b/tests/test/script/runner/timeout.testscript
index bf39034..5f87d39 100644
--- a/tests/test/script/runner/timeout.testscript
+++ b/tests/test/script/runner/timeout.testscript
@@ -54,14 +54,14 @@
   : missing
   :
   $c <'timeout' && $b 2>>~%EOE% != 0
-    testscript:1:1: error: missing timeout
+    testscript:1:1: error: timeout: missing timeout
     %.
     EOE
 
   : invalid
   :
   $c <'timeout foo' && $b 2>>~%EOE% != 0
-    testscript:1:1: error: invalid test fragment timeout 'foo'
+    testscript:1:1: error: timeout: invalid test fragment timeout 'foo'
     %.
     EOE
 }
@@ -121,7 +121,7 @@
         +timeout foo/
       }
       EOI
-      testscript:2:4: error: invalid test group timeout 'foo'
+      testscript:2:4: error: timeout: invalid test group timeout 'foo'
       %.
       EOE
   }
@@ -176,7 +176,7 @@
         +timeout /foo
       }
       EOI
-      testscript:2:4: error: invalid test timeout 'foo'
+      testscript:2:4: error: timeout: invalid test timeout 'foo'
       %.
       EOE
   }
@@ -229,7 +229,7 @@
     $c <<EOI && $b 2>>~%EOE% != 0
       +timeout foo/
       EOI
-      testscript:1:2: error: invalid testscript timeout 'foo'
+      testscript:1:2: error: timeout: invalid testscript timeout 'foo'
       %.
       EOE
 
@@ -300,7 +300,7 @@
         +timeout /foo
       }
       EOI
-      testscript:2:4: error: invalid test timeout 'foo'
+      testscript:2:4: error: timeout: invalid test timeout 'foo'
       %.
       EOE
   }
-- 
cgit v1.1