From: Sami Kerola Date: Sat, 3 Oct 2015 22:39:33 +0000 (+0100) Subject: tests: update colcrt test expectations X-Git-Tag: v2.28-rc1~121^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ca4fc10867e792fd431d06ccbd282b7353992e;p=thirdparty%2Futil-linux.git 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 --- diff --git a/tests/expected/colcrt/functional-half-lines b/tests/expected/colcrt/functional-half-lines index 07a85ab5f7..a7957f884d 100644 --- 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 3ee7c070bc..4b41b07f8d 100644 --- 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 e0e877fe1e..306734c4f1 100644 --- 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 09a870e3f5..bd2d44b616 100644 --- 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 a221b56c33..67a7b1c998 100644 --- 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 a4472fa29d..11ebf74a8f 100644 --- 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