Skip to content

Commit adb7c8a

Browse files
NWilsonNWilson
committed
Fix line-wrapping in testoutput3 files
1 parent 20d81e3 commit adb7c8a

File tree

6 files changed

+57
-29
lines changed

6 files changed

+57
-29
lines changed

‎RunTest‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,12 +621,14 @@ for bmode in "$test8" "$test16" "$test32"; do
621621
*) with="";;
622622
esac
623623
if $cf $outfile testtry >teststdout || \
624-
$cf $outfile2 testtry >teststdout || \
625-
$cf $outfile3 testtry >teststdout || \
626-
$cf $outfile4 testtry >teststdout
624+
$cf $outfile2 testtry >>teststdout || \
625+
$cf $outfile3 testtry >>teststdout || \
626+
$cf $outfile4 testtry >>teststdout
627627
then
628628
echo " OK$with"
629629
else
630+
cat teststdout
631+
echo ""
630632
echo "** Locale test did not run successfully$with. The output did not match"
631633
echo " $outfile, $outfile2, $outfile3 or $outfile4."
632634
echo " This may mean that there is a problem with the locale settings rather"

‎testdata/testoutput3‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ Subject length lower bound = 1
8282
Capture group count = 0
8383
Starting code units: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P
8484
Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z
85-
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2
86-
\xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
85+
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb
86+
\xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb
87+
\xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea
88+
\xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa
89+
\xfb \xfc \xfd \xfe \xff
8790
Subject length lower bound = 1
8891

8992
# All remaining tests are in the fr_FR locale, so set the default.
@@ -169,9 +172,11 @@ No match
169172
------------------------------------------------------------------
170173
Capture group count = 0
171174
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
172-
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7
173-
\xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed
174-
\xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175+
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1
176+
\xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0
177+
\xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0
178+
\xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef
179+
\xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175180
Subject length lower bound = 3
176181

177182
# End of testinput3

‎testdata/testoutput3A‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ Subject length lower bound = 1
8282
Capture group count = 0
8383
Starting code units: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P
8484
Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z
85-
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2
86-
\xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
85+
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb
86+
\xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb
87+
\xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea
88+
\xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa
89+
\xfb \xfc \xfd \xfe \xff
8790
Subject length lower bound = 1
8891

8992
# All remaining tests are in the fr_FR locale, so set the default.
@@ -169,9 +172,11 @@ No match
169172
------------------------------------------------------------------
170173
Capture group count = 0
171174
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
172-
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7
173-
\xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed
174-
\xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175+
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1
176+
\xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0
177+
\xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0
178+
\xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef
179+
\xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175180
Subject length lower bound = 3
176181

177182
# End of testinput3

‎testdata/testoutput3B‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ Subject length lower bound = 1
8282
Capture group count = 0
8383
Starting code units: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P
8484
Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z
85-
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2
86-
\xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
85+
\xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb
86+
\xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb
87+
\xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea
88+
\xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa
89+
\xfb \xfc \xfd \xfe \xff
8790
Subject length lower bound = 1
8891

8992
# All remaining tests are in the fr_FR locale, so set the default.
@@ -169,9 +172,11 @@ No match
169172
------------------------------------------------------------------
170173
Capture group count = 0
171174
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
172-
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7
173-
\xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed
174-
\xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175+
a b c d e f g h i j k l m n o p q r s t u v w x y z \xaa \xb5 \xba \xc0 \xc1
176+
\xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0
177+
\xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0
178+
\xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef
179+
\xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175180
Subject length lower bound = 3
176181

177182
# End of testinput3

‎testdata/testoutput3C‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ Subject length lower bound = 1
8282
Capture group count = 0
8383
Starting code units: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P
8484
Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z
85-
\xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5
86-
\xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
85+
\xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce
86+
\xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde
87+
\xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed
88+
\xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd
89+
\xfe \xff
8790
Subject length lower bound = 1
8891

8992
# All remaining tests are in the fr_FR locale, so set the default.
@@ -169,9 +172,11 @@ No match
169172
------------------------------------------------------------------
170173
Capture group count = 0
171174
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
172-
a b c d e f g h i j k l m n o p q r s t u v w x y z \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca
173-
\xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0
174-
\xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175+
a b c d e f g h i j k l m n o p q r s t u v w x y z \xc0 \xc1 \xc2 \xc3 \xc4
176+
\xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3
177+
\xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3
178+
\xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2
179+
\xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
175180
Subject length lower bound = 3
176181

177182
# End of testinput3

‎testdata/wintestoutput3‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,12 @@ Subject length lower bound = 1
8282
Capture group count = 0
8383
Starting code units: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P
8484
Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z
85-
\x83 \x8a \x8c \x8e \x9a \x9c \x9e \x9f \xaa \xb2 \xb3 \xb5 \xb9 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6
86-
\xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd
87-
\xfe \xff
85+
\x83 \x8a \x8c \x8e \x9a \x9c \x9e \x9f \xaa \xb2 \xb3 \xb5 \xb9 \xba \xc0
86+
\xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf
87+
\xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf
88+
\xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee
89+
\xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe
90+
\xff
8891
Subject length lower bound = 1
8992

9093
# All remaining tests are in the french locale, so set the default.
@@ -170,9 +173,12 @@ No match
170173
------------------------------------------------------------------
171174
Capture group count = 0
172175
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
173-
a b c d e f g h i j k l m n o p q r s t u v w x y z \x83 \x8a \x8c \x8e \x9a \x9c \x9e \x9f \xaa \xb5 \xba
174-
\xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5
175-
\xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
176+
a b c d e f g h i j k l m n o p q r s t u v w x y z \x83 \x8a \x8c \x8e \x9a
177+
\x9c \x9e \x9f \xaa \xb5 \xba \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8
178+
\xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd8
179+
\xd9 \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7
180+
\xe8 \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6
181+
\xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff
176182
Subject length lower bound = 3
177183

178184
# End of wintestinput3

0 commit comments

Comments
 (0)