Jim Meyering wrote:
> Paolo Bonzini wrote:
>> So, here are my patches for 2.6. While they are big, they are worth
>
> Thanks!
> I've ACK'd the syntax-related ones.
> Now, I'll apply everything, and do a little testing
> before reviewing the meatier change sets.
FYI, I turned off -Werror to get past the build warning/failure,
and when I ran "make check" I got these two failures on F12:
FAIL: case-fold-char-type (exit: 1)
===================================
++ initial_cwd_=/home/j/w/co/grep/tests
+++ expr ././case-fold-char-type : '.*/\(.*\)$'
++ ME_=case-fold-char-type
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /home/j/w/co/grep/tests gt-case-fold-char-type.XXXX
+++ case $# in
+++ destdir_=/home/j/w/co/grep/tests
+++ template_=gt-case-fold-char-type.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
+++ fail=0
++++ env -u TMPDIR mktemp -d -t -p /home/j/w/co/grep/tests
gt-case-fold-char-type.XXXX
+++ d=/home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
+++ case $d in
+++ test -d /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
++++ ls -dgo /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
++++ tr S -
+++ perms='drwx------. 2 4096 Mar 13 10:51
/home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv'
+++ case $perms in
+++ test 0 = 0
+++ echo /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
+++ return
++ test_dir_=/home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
++ cd /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
++ trap remove_tmp_ 0
++ trap 'Exit $?' 1 2 13 15
+ path_prepend_ ../src
+ test 1 '!=' 0
+ path_dir_=../src
+ case $path_dir_ in
++ cd /home/j/w/co/grep/tests/../src
++ echo /home/j/w/co/grep/src
+ abs_path_dir_=/home/j/w/co/grep/src
+ case $abs_path_dir_ in
+
PATH=/home/j/w/co/grep/src:/home/j/w/co/grep/src:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib64/ccache:/home/j/bin/perl:/home/j/bin:/p/p/git/bin:/p/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local:/usr/local/bin
+ shift
+ test 0 '!=' 0
+ export PATH
+ printf 'Y\n'
+ fail=0
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ LC_ALL=en_US.UTF-8
+ grep -i '[[:lower:]]'
grep: dfa.c:245: setbit_case_fold: Assertion `(__ctype_get_mb_cur_max ()) == 1'
failed.
+ printf '1\nY\n.\n'
./case-fold-char-type: line 9: 29200 Done printf '1\nY\n.\n'
29201 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:lower:]]' > out1
+ fail=1
+ compare out1 exp1
+ diff -u out1 exp1
--- out1 2010-03-13 10:51:57.065603744 +0100
+++ exp1 2010-03-13 10:51:57.065603744 +0100
@@ -0,0 +1 @@
+Y
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ printf '1\nY\n.\n'
+ LC_ALL=zh_CN
+ grep -i '[[:lower:]]'
grep: dfa.c£º245£ºsetbit_case_fold: ¶ÏÑÔ¡°(__ctype_get_mb_cur_max ()) ==
1¡±Ê§°Ü¡£
./case-fold-char-type: line 9: 29255 Done printf '1\nY\n.\n'
29273 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:lower:]]' > out1
+ fail=1
+ compare out1 exp1
+ diff -u out1 exp1
--- out1 2010-03-13 10:51:57.081603899 +0100
+++ exp1 2010-03-13 10:51:57.065603744 +0100
@@ -0,0 +1 @@
+Y
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ printf '1\nY\n.\n'
+ LC_ALL=fr_FR.UTF-8
+ grep -i '[[:lower:]]'
grep: dfa.c :245 : setbit_case_fold: L'assertion
« (__ctype_get_mb_cur_max ()) == 1 » a échoué.
./case-fold-char-type: line 9: 29329 Done printf '1\nY\n.\n'
29334 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:lower:]]' > out1
+ fail=1
+ compare out1 exp1
+ diff -u out1 exp1
--- out1 2010-03-13 10:51:57.094603878 +0100
+++ exp1 2010-03-13 10:51:57.065603744 +0100
@@ -0,0 +1 @@
+Y
+ fail=1
+ printf 'y\n'
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ LC_ALL=en_US.UTF-8
+ grep -i '[[:upper:]]'
grep: dfa.c:245: setbit_case_fold: Assertion `(__ctype_get_mb_cur_max ()) == 1'
failed.
+ printf '1\ny\n.\n'
./case-fold-char-type: line 16: 29392 Done printf '1\ny\n.\n'
29394 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:upper:]]' > out2
+ fail=1
+ compare out2 exp2
+ diff -u out2 exp2
--- out2 2010-03-13 10:51:57.109603674 +0100
+++ exp2 2010-03-13 10:51:57.106603789 +0100
@@ -0,0 +1 @@
+y
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ printf '1\ny\n.\n'
+ LC_ALL=zh_CN
+ grep -i '[[:upper:]]'
grep: dfa.c£º245£ºsetbit_case_fold: ¶ÏÑÔ¡°(__ctype_get_mb_cur_max ()) ==
1¡±Ê§°Ü¡£
./case-fold-char-type: line 16: 29439 Done printf '1\ny\n.\n'
29447 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:upper:]]' > out2
+ fail=1
+ compare out2 exp2
+ diff -u out2 exp2
--- out2 2010-03-13 10:51:57.117604572 +0100
+++ exp2 2010-03-13 10:51:57.106603789 +0100
@@ -0,0 +1 @@
+y
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ printf '1\ny\n.\n'
+ LC_ALL=fr_FR.UTF-8
+ grep -i '[[:upper:]]'
grep: dfa.c :245 : setbit_case_fold: L'assertion
« (__ctype_get_mb_cur_max ()) == 1 » a échoué.
./case-fold-char-type: line 16: 29474 Done printf '1\ny\n.\n'
29493 Aborted (core dumped) | LC_ALL=$LOC grep -i
'[[:upper:]]' > out2
+ fail=1
+ compare out2 exp2
+ diff -u out2 exp2
--- out2 2010-03-13 10:51:57.128603918 +0100
+++ exp2 2010-03-13 10:51:57.106603789 +0100
@@ -0,0 +1 @@
+y
+ fail=1
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /home/j/w/co/grep/tests
+ chmod -R u+rwx /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
+ rm -rf /home/j/w/co/grep/tests/gt-case-fold-char-type.Uauv
+ exit 1
FAIL: dfaexec-multibyte (exit: 1)
=================================
++ initial_cwd_=/home/j/w/co/grep/tests
+++ expr ././dfaexec-multibyte : '.*/\(.*\)$'
++ ME_=dfaexec-multibyte
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /home/j/w/co/grep/tests gt-dfaexec-multibyte.XXXX
+++ case $# in
+++ destdir_=/home/j/w/co/grep/tests
+++ template_=gt-dfaexec-multibyte.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
+++ fail=0
++++ env -u TMPDIR mktemp -d -t -p /home/j/w/co/grep/tests
gt-dfaexec-multibyte.XXXX
+++ d=/home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
+++ case $d in
+++ test -d /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
++++ ls -dgo /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
++++ tr S -
+++ perms='drwx------. 2 4096 Mar 13 10:51
/home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK'
+++ case $perms in
+++ test 0 = 0
+++ echo /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
+++ return
++ test_dir_=/home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
++ cd /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
++ trap remove_tmp_ 0
++ trap 'Exit $?' 1 2 13 15
+ path_prepend_ ../src
+ test 1 '!=' 0
+ path_dir_=../src
+ case $path_dir_ in
++ cd /home/j/w/co/grep/tests/../src
++ echo /home/j/w/co/grep/src
+ abs_path_dir_=/home/j/w/co/grep/src
+ case $abs_path_dir_ in
+
PATH=/home/j/w/co/grep/src:/home/j/w/co/grep/src:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib64/ccache:/home/j/bin/perl:/home/j/bin:/p/p/git/bin:/p/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local:/usr/local/bin
+ shift
+ test 0 '!=' 0
+ export PATH
+ printf 'aa\n'
+ printf 'ab\n'
+ printf '1 2 3\n'
+ fail=0
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ LC_ALL=en_US.UTF-8
+ grep -E '([a]|[b]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=en_US.UTF-8
+ grep -E '([b]|[a]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=en_US.UTF-8
+ grep -E '([b]|[a]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=en_US.UTF-8
+ grep -E '([a]|[b]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=en_US.UTF-8
+ grep -E '^([[:digit:]]+[[:space:]]+){2}'
grep: dfa.c:245: setbit_case_fold: Assertion `(__ctype_get_mb_cur_max ()) == 1'
failed.
./dfaexec-multibyte: line 12: 29361 Aborted (core dumped)
LC_ALL=$LOC grep -E '^([[:digit:]]+[[:space:]]+){2}' < exp-123 > out
+ fail=1
+ compare out exp-123
+ diff -u out exp-123
--- out 2010-03-13 10:51:57.100603770 +0100
+++ exp-123 2010-03-13 10:51:57.077603709 +0100
@@ -0,0 +1 @@
+1 2 3
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ LC_ALL=zh_CN
+ grep -E '([a]|[b]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=zh_CN
+ grep -E '([b]|[a]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=zh_CN
+ grep -E '([b]|[a]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=zh_CN
+ grep -E '([a]|[b]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=zh_CN
+ grep -E '^([[:digit:]]+[[:space:]]+){2}'
grep: dfa.c£º245£ºsetbit_case_fold: ¶ÏÑÔ¡°(__ctype_get_mb_cur_max ()) ==
1¡±Ê§°Ü¡£
./dfaexec-multibyte: line 12: 29497 Aborted (core dumped)
LC_ALL=$LOC grep -E '^([[:digit:]]+[[:space:]]+){2}' < exp-123 > out
+ fail=1
+ compare out exp-123
+ diff -u out exp-123
--- out 2010-03-13 10:51:57.128603918 +0100
+++ exp-123 2010-03-13 10:51:57.077603709 +0100
@@ -0,0 +1 @@
+1 2 3
+ fail=1
+ for LOC in en_US.UTF-8 zh_CN '$LOCALE_FR_UTF8'
+ LC_ALL=fr_FR.UTF-8
+ grep -E '([a]|[b]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=fr_FR.UTF-8
+ grep -E '([b]|[a]){2}'
+ compare out exp-aa
+ diff -u out exp-aa
+ LC_ALL=fr_FR.UTF-8
+ grep -E '([b]|[a]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=fr_FR.UTF-8
+ grep -E '([a]|[b]){2}'
+ compare out exp-ab
+ diff -u out exp-ab
+ LC_ALL=fr_FR.UTF-8
+ grep -E '^([[:digit:]]+[[:space:]]+){2}'
grep: dfa.c :245 : setbit_case_fold: L'assertion
« (__ctype_get_mb_cur_max ()) == 1 » a échoué.
./dfaexec-multibyte: line 12: 29706 Aborted (core dumped)
LC_ALL=$LOC grep -E '^([[:digit:]]+[[:space:]]+){2}' < exp-123 > out
+ fail=1
+ compare out exp-123
+ diff -u out exp-123
--- out 2010-03-13 10:51:57.175603617 +0100
+++ exp-123 2010-03-13 10:51:57.077603709 +0100
@@ -0,0 +1 @@
+1 2 3
+ fail=1
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /home/j/w/co/grep/tests
+ chmod -R u+rwx /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
+ rm -rf /home/j/w/co/grep/tests/gt-dfaexec-multibyte.urmK
+ exit 1
=================================
2 of 25 tests failed
See tests/test-suite.log
Please report to bug-grep@gnu.org
=================================
make[3]: *** [test-suite.log] Error 1
make[3]: Leaving directory `/home/j/w/co/grep/tests'
make[2]: *** [check-TESTS] Error 2
make[2]: Leaving directory `/home/j/w/co/grep/tests'
make[1]: *** [check-am] Error 2
make[1]: Leaving directory `/home/j/w/co/grep/tests'
make: *** [check-recursive] Error 1
