tests: update colcrt test expectations

The reimplementation caused output to change in some corner cases, such as
how binary inputs, long lines with underscores, and white space trimming,
are handled.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/tests/expected/colcrt/functional-half-lines b/tests/expected/colcrt/functional-half-lines
index 07a85ab5f7414f42118c7b47b4a19443f7488773..a7957f884dea83e421757216cb3af07f2198b196 100644 (file)
--- a/tests/expected/colcrt/functional-half-lines
+++ b/tests/expected/colcrt/functional-half-lines
@@ -1,9 +1,9 @@
 
-   100  
+   100
         -
-   101  
+   101
         --
-   102  
+   102
         ---
    103   x
         - --
@@ -11,9 +11,11 @@
 
    105  esc9
 
-
    106  esc8
-   107  esc7
+
+   107  esc
+
+   108  esc6
 
    109  backspace
 
@@ -27,18 +29,18 @@
 
    114  |   |
          ---
-   115  line longer than 132 characters line longer than 132 characters line longer than 132 characters line longer than 132 ch01234            -      -    -   -          -    -      -    -   -          -    -      -    -   -          -    -      -    -   -
+   115  line longer than 132 characters line longer than 132 characters line longer than 132 characters line longer than 132 ch01234
             -      -    -   -          -    -      -    -   -          -    -      -    -   -          -    -      -    -   -
    116  nulls
 
    117  next line ascii 0 - 127
 
-   118  
+   118
 
-)*+119/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^ `abcdefghijklmnopqrstuvwxyz{|}~
-                                                      -
+   119
+                                                                        -
 
-   200  
+   200
         ---
    201  abc
 

diff --git a/tests/expected/colcrt/functional-no-options b/tests/expected/colcrt/functional-no-options
index 3ee7c070bcf9720e5fb93286cf3298da5a6c0b57..4b41b07f8d697be0722497833c5c47cbc3cf6113 100644 (file)
--- a/tests/expected/colcrt/functional-no-options
+++ b/tests/expected/colcrt/functional-no-options
@@ -1,16 +1,16 @@
-   100  
+   100
         -
-   101  
+   101
         --
-   102  
+   102
         ---
    103   x
         - --
    104  shift
    105  esc9
-
    106  esc8
-   107  esc7
+   107  esc
+   108  esc6
    109  backspace
    110  tab     tab
    111  abc  efg
@@ -19,14 +19,14 @@
    113  | x |
    114  |   |
          ---
-   115  line longer than 132 characters line longer than 132 characters line longer than 132 characters line longer than 132 ch01234            -      -    -   -          -    -      -    -   -          -    -      -    -   -          -    -      -    -   -
+   115  line longer than 132 characters line longer than 132 characters line longer than 132 characters line longer than 132 ch01234
             -      -    -   -          -    -      -    -   -          -    -      -    -   -          -    -      -    -   -
    116  nulls
    117  next line ascii 0 - 127
-   118  
-)*+119/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^ `abcdefghijklmnopqrstuvwxyz{|}~
-                                                      -
-   200  
+   118
+   119
+                                                                        -
+   200
         ---
    201  abc
    202   abc

diff --git a/tests/expected/colcrt/functional-no-underlining b/tests/expected/colcrt/functional-no-underlining
index e0e877fe1ec26a0f10a6151e0c2f5d525053f686..306734c4f1ff502040a30583342f6082f3c76c4f 100644 (file)
--- a/tests/expected/colcrt/functional-no-underlining
+++ b/tests/expected/colcrt/functional-no-underlining
@@ -1,12 +1,12 @@
-   100  
-   101  
-   102  
+   100
+   101
+   102
    103   x
    104  shift
    105  esc9
-
    106  esc8
-   107  esc7
+   107  esc
+   108  esc6
    109  backspace
    110  tab     tab
    111  abc  efg
@@ -16,9 +16,9 @@
    115  line longer than 132 characters line longer than 132 characters line longer than 132 characters line longer than 132 ch01234
    116  nulls
    117  next line ascii 0 - 127
-   118  
-)*+119/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^ `abcdefghijklmnopqrstuvwxyz{|}~
-   200  
+   118
+   119
+   200
    201  abc
    202   abc
    203  a bc

diff --git a/tests/expected/colcrt/functional-short-options b/tests/expected/colcrt/functional-short-options
index 09a870e3f56c26028d28a62059dbdb64bf64d61b..bd2d44b61621662b77b057a25be5ea51574982cf 100644 (file)
--- a/tests/expected/colcrt/functional-short-options
+++ b/tests/expected/colcrt/functional-short-options
@@ -1,9 +1,9 @@
 
-   100  
+   100
 
-   101  
+   101
 
-   102  
+   102
 
    103   x
 
@@ -11,9 +11,11 @@
 
    105  esc9
 
-
    106  esc8
-   107  esc7
+
+   107  esc
+
+   108  esc6
 
    109  backspace
 
@@ -33,12 +35,12 @@
 
    117  next line ascii 0 - 127
 
-   118  
+   118
 
-)*+119/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^ `abcdefghijklmnopqrstuvwxyz{|}~
+   119
 
 
-   200  
+   200
 
    201  abc
 

diff --git a/tests/expected/colcrt/regressions-crash1 b/tests/expected/colcrt/regressions-crash1
index a221b56c338ba9f200395399c51df98db8f0f7c8..67a7b1c998c9f9ddeb0b8f297701404ad15c8e4d 100644 (file)
--- a/tests/expected/colcrt/regressions-crash1
+++ b/tests/expected/colcrt/regressions-crash1
@@ -1 +1,2 @@
+ W U;    U;  D  f U;  D  f    D  f    >     @W  ]~   K- -  ----  -- -- -  -- -- ---- -- ---- --  -  --  --- --
 return value: 0

diff --git a/tests/expected/colcrt/regressions-crash2 b/tests/expected/colcrt/regressions-crash2
index a4472fa29d6a2ba1536fe0470aeb9fe2b38538fd..11ebf74a8fd0493bccbdbd64eb8390a2a382261a 100644 (file)
--- a/tests/expected/colcrt/regressions-crash2
+++ b/tests/expected/colcrt/regressions-crash2
@@ -1,386 +1,10 @@
-        
-
-FGHIKIJKN\|
-
-MN9|    
-XYZRnT RnTUV|   NXP:w|  
 
+FGHIKIJKN\
+MN9|
+XYZRnT RnTUV|   NXP:w
 MN
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-'QRnTUVWXYZQRnTU|
-
-MN9|    
-|       
-
-return value: 0
+'QRnTUVWXYZQRnTU
+MN9|
+XYZ nT RnTUV|   NXP:w
+   -
+MNOP.return value: 0