From 28106f96de8ae5cdb3a0ee0e3a8a8185551e3b00 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 20 Jan 2017 20:25:59 +0300
Subject: Add support for comparison of test command output to a file

---
 .../test/script/lexer/command-expansion.test       | 24 +++++++++++-----------
 unit-tests/test/script/lexer/command-line.test     | 24 ++++++++++++++++------
 2 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'unit-tests/test/script/lexer')

diff --git a/unit-tests/test/script/lexer/command-expansion.test b/unit-tests/test/script/lexer/command-expansion.test
index faae29d..d405de6 100644
--- a/unit-tests/test/script/lexer/command-expansion.test
+++ b/unit-tests/test/script/lexer/command-expansion.test
@@ -9,30 +9,30 @@ test.arguments = command-expansion
 {
   : in
   :
-  $* <:"0<+" >>EOO
+  $* <:"0<|" >>EOO
   '0'
-  <+
+  <|
   EOO
 
   : arg-in
   :
-  $* <:"0 <+" >>EOO
+  $* <:"0 <|" >>EOO
   '0 '
-  <+
+  <|
   EOO
 
   : out
   :
-  $* <:"1>+" >>EOO
+  $* <:"1>|" >>EOO
   '1'
-  >+
+  >|
   EOO
 
   : arg-out
   :
-  $* <:"1 >+" >>EOO
+  $* <:"1 >|" >>EOO
   '1 '
-  >+
+  >|
   EOO
 }
 
@@ -189,17 +189,17 @@ test.arguments = command-expansion
 
   : out
   :
-  $* <:"1>>>a b" >>EOO
+  $* <:"1>=a b" >>EOO
   '1'
-  >>>
+  >=
   'a b'
   EOO
 
   : out-app
   :
-  $* <:"1>>>&a b" >>EOO
+  $* <:"1>+a b" >>EOO
   '1'
-  >>>&
+  >+
   'a b'
   EOO
 }
diff --git a/unit-tests/test/script/lexer/command-line.test b/unit-tests/test/script/lexer/command-line.test
index 8a73b3d..57fcfdf 100644
--- a/unit-tests/test/script/lexer/command-line.test
+++ b/unit-tests/test/script/lexer/command-line.test
@@ -64,11 +64,11 @@ test.arguments = command-line
 {
   : pass
   :
-  $* <"cmd <+ 1>+" >>EOO
+  $* <"cmd <| 1>|" >>EOO
   'cmd'
-  <+
+  <|
   '1'
-  >+
+  >|
   <newline>
   EOO
 
@@ -140,16 +140,28 @@ test.arguments = command-line
   <newline>
   EOO
 
-  : file
+  : file-cmp
   :
-  $* <"cmd <<<in >>>out 2>>>&err" >>EOO
+  $* <"cmd <<<in >>>out 2>>>err" >>EOO
   'cmd'
   <<<
   'in'
   >>>
   'out'
   '2'
-  >>>&
+  >>>
+  'err'
+  <newline>
+  EOO
+
+  : file-write
+  :
+  $* <"cmd >=out 2>+err" >>EOO
+  'cmd'
+  >=
+  'out'
+  '2'
+  >+
   'err'
   <newline>
   EOO
-- 
cgit v1.1