From fca95dafaaab44d3e06e10bc9f3b45d00c82301f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 2 Nov 2022 22:22:09 +0300
Subject: Use diag_buffer in script

---
 tests/test/script/runner/timeout.testscript | 32 +++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'tests/test/script/runner/timeout.testscript')

diff --git a/tests/test/script/runner/timeout.testscript b/tests/test/script/runner/timeout.testscript
index 5f87d39..f9b6ec7 100644
--- a/tests/test/script/runner/timeout.testscript
+++ b/tests/test/script/runner/timeout.testscript
@@ -424,7 +424,9 @@
   $c <<EOI && $b 2>>~%EOE% != 0
   env -t 1 -- $* -l 86400 -o 'foo' | touch $~/foo/bar
   EOI
-  %testscript:.*: error: touch exited with code 1%
+  %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
+  %.
+  %testscript:.*: error: builtin touch exited with code 1%
   %.+
   EOE
 }
@@ -435,42 +437,54 @@
   : prog-tm-prog
   :
   $c <'$* -l 10 | env -t 1 -- $* -i 0' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: .+driver.* terminated: execution timeout expired%
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
     %.
     EOE
 
   : tm-prog-prog
   :
   $c <'env -t 1 -- $* -l 10 | $* -i 0' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: .+driver.* terminated: execution timeout expired%
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
     %.
     EOE
 
   : tm-cat-prog
   :
-  $c <'env -t 1 -- cat <"test" | $* -l 10' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: cat terminated: execution timeout expired%
+  $c <'env -t 3 -- cat <"test" | $* -l 10' && $b 2>>~%EOE% != 0
+    %testscript:.*: error: builtin cat terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
     %.
     EOE
 
   : cat-tm-prog
   :
   $c <'cat <"test" | env -t 1 -- $* -l 10' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: .+driver.* terminated: execution timeout expired%
+    %testscript:.*: error: builtin cat terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
     %.
     EOE
 
   : tm-prog-cat
   :
   $c <'env -t 1 -- $* -l 10 | cat >-' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: .+driver.* terminated: execution timeout expired%
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: builtin cat terminated: execution timeout expired%
     %.
     EOE
 
   : tm-echo-prog
   :
-  $c <'env -t 1 -- echo "test" | $* -l 10' && $b 2>>~%EOE% != 0
-    %testscript:.*: error: echo terminated: execution timeout expired%
+  $c <'env -t 3 -- echo "test" | $* -l 10' && $b 2>>~%EOE% != 0
+    %testscript:.*: error: builtin echo terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
     %.
     EOE
 
-- 
cgit v1.1