From 801424e0bb9c17adc3bf049f8b06212de7e5b01d Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Wed, 20 Apr 2022 00:20:32 +0100 Subject: Update test baselines to match new error messages from GHC.IO.Encoding.Failure (cherry picked from commit 250f57c17f72ba11eda3655f553957f6f04c0399) --- libraries/base/tests/IO/decodingerror001.stdout | 20 +++++++------- libraries/base/tests/IO/decodingerror002.stdout | 2 +- libraries/base/tests/IO/encoding002.stdout | 10 +++---- libraries/base/tests/IO/encodingerror001.stdout | 36 ++++++++++++------------- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'libraries') diff --git a/libraries/base/tests/IO/decodingerror001.stdout b/libraries/base/tests/IO/decodingerror001.stdout index 24ca1a95b0..4df6d2b500 100644 --- a/libraries/base/tests/IO/decodingerror001.stdout +++ b/libraries/base/tests/IO/decodingerror001.stdout @@ -1,10 +1,10 @@ -UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (invalid byte sequence) -UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (invalid byte sequence) -UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (invalid byte sequence) -UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (invalid byte sequence) -UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (invalid byte sequence) -UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (invalid byte sequence) -UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (invalid byte sequence) -UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (invalid byte sequence) -UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (invalid byte sequence) -UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (invalid byte sequence) +UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (cannot decode byte sequence starting from 128) +UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (cannot decode byte sequence starting from 128) +UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (cannot decode byte sequence starting from 128) +UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (cannot decode byte sequence starting from 128) +UTF8 error:Left decodingerror001.in1: hGetChar: invalid argument (cannot decode byte sequence starting from 128) +UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (cannot decode byte sequence starting from 240) +UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (cannot decode byte sequence starting from 240) +UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (cannot decode byte sequence starting from 240) +UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (cannot decode byte sequence starting from 240) +UTF8 incomplete sequence at end:Left decodingerror001.in2: hGetChar: invalid argument (cannot decode byte sequence starting from 240) diff --git a/libraries/base/tests/IO/decodingerror002.stdout b/libraries/base/tests/IO/decodingerror002.stdout index e1cef33d0d..09c057116b 100644 --- a/libraries/base/tests/IO/decodingerror002.stdout +++ b/libraries/base/tests/IO/decodingerror002.stdout @@ -1,4 +1,4 @@ -Left decodingerror002.in: hGetChar: invalid argument (invalid byte sequence) +Left decodingerror002.in: hGetChar: invalid argument (cannot decode byte sequence starting from 200) Left decodingerror002.in: hGetChar: end of file �Left decodingerror002.in: hGetChar: end of file ÈLeft decodingerror002.in: hGetChar: end of file diff --git a/libraries/base/tests/IO/encoding002.stdout b/libraries/base/tests/IO/encoding002.stdout index 0cc885baa0..d4a8e07813 100644 --- a/libraries/base/tests/IO/encoding002.stdout +++ b/libraries/base/tests/IO/encoding002.stdout @@ -5,7 +5,7 @@ True == UTF-8: decoding -"recoverDecode: invalid argument (invalid byte sequence)" +"recoverDecode: invalid argument (cannot decode byte sequence starting from 237)" "Hi!" "Hi\65533\65533\65533!" "Hi\56557\56498\56448!" @@ -16,7 +16,7 @@ True [72,105,128,33] == UTF-16LE: decoding -"recoverDecode: invalid argument (invalid byte sequence)" +"recoverDecode: invalid argument (cannot decode byte sequence starting from 255)" "Hi\65503\8671" "Hi\65533\65503\8671\65533" "Hi\56575\65503\8671\NUL" @@ -27,7 +27,7 @@ True [72,0,105,0,128,33,0] == UTF-16BE: decoding -"recoverDecode: invalid argument (invalid byte sequence)" +"recoverDecode: invalid argument (cannot decode byte sequence starting from 223)" "Hi\65503\65280" "Hi\65533\65503\65280\65533" "Hi\56543\65503\65280!" @@ -38,7 +38,7 @@ True [0,72,0,105,128,0,33] == UTF-32LE: decoding -"recoverDecode: invalid argument (invalid byte sequence)" +"recoverDecode: invalid argument (cannot decode byte sequence starting from 237)" "Hi\8448" "Hi\65533\65533\65533\8448\65533" "Hi\56557\56498\56448\8448\NUL" @@ -49,7 +49,7 @@ True [72,0,0,0,105,0,0,0,128,33,0,0,0] == UTF-32BE: decoding -"recoverDecode: invalid argument (invalid byte sequence)" +"recoverDecode: invalid argument (cannot decode byte sequence starting from 0)" "Hi!" "Hi\65533\65533\65533\65533!" "Hi\NUL\56448\56498\56557!" diff --git a/libraries/base/tests/IO/encodingerror001.stdout b/libraries/base/tests/IO/encodingerror001.stdout index 7406cd9168..9667cc13f6 100644 --- a/libraries/base/tests/IO/encodingerror001.stdout +++ b/libraries/base/tests/IO/encodingerror001.stdout @@ -1,36 +1,36 @@ test 1 -Caught : hPutChar: invalid argument (invalid character) while trying to write "\283\n" +Caught : hPutChar: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : hPutChar: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : hPutChar: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : hPutChar: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : hPutChar: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" test 1 -Caught : commitBuffer: invalid argument (invalid character) while trying to write "\283\n" +Caught : commitBuffer: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : commitBuffer: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : commitBuffer: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : commitBuffer: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : commitBuffer: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" test 1 -Caught : commitBuffer: invalid argument (invalid character) while trying to write "\283\n" +Caught : commitBuffer: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : commitBuffer: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : commitBuffer: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : commitBuffer: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : commitBuffer: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" test 1 -Caught : commitBuffer: invalid argument (invalid character) while trying to write "\283\n" +Caught : commitBuffer: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : commitBuffer: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : commitBuffer: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : commitBuffer: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : commitBuffer: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" test 1 -Caught : commitBuffer: invalid argument (invalid character) while trying to write "\283\n" +Caught : commitBuffer: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : commitBuffer: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : commitBuffer: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : commitBuffer: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : commitBuffer: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" test 1 -Caught : commitBuffer: invalid argument (invalid character) while trying to write "\283\n" +Caught : commitBuffer: invalid argument (cannot encode character '\283') while trying to write "\283\n" test 2 -HCaught : commitBuffer: invalid argument (invalid character) while trying to write "H\941llo\n" +HCaught : commitBuffer: invalid argument (cannot encode character '\941') while trying to write "H\941llo\n" test 3 -Hello Caught : commitBuffer: invalid argument (invalid character) while trying to write "Hello \945\946\947\n" +Hello Caught : commitBuffer: invalid argument (cannot encode character '\945') while trying to write "Hello \945\946\947\n" -- cgit v1.2.1