On 12/24/2011 02:01 PM, Eli Zaretskii wrote:
This changeset fixes a few problems in the test suite which fail some tests due to reasons that have nothing to do with Grep per se.Fix the test suite for MS-Windows. * tests/reversed-range-endpoints: Don't reject program names with leading directories and drive letters. * tests/warn-char-classes: Likewise. * tests/include-exclude: Use --directories=skip, to avoid gratuitous failures on systems that cannot grep directories. diff -up -r grep-2.10.orig/tests/include-exclude grep-2.10.MinGW/tests/include-exclude --- grep-2.10.orig/tests/include-exclude 2011-09-10 13:17:04.000000000 +0300 +++ grep-2.10.MinGW/tests/include-exclude 2011-12-20 11:41:49.623909700 +0200 @@ -40,7 +40,7 @@ grep -r --include='a*' . x> out || f compare out exp-a || fail=1 # --include (without --recursive) uses different code -grep --include=a '^aaa$' x/*> out || fail=1 +grep --directories=skip --include=a '^aaa$' x/*> out || fail=1 compare out exp-a || fail=1 Exit $fail diff -up -r grep-2.10.orig/tests/reversed-range-endpoints grep-2.10.MinGW/tests/reversed-range-endpoints --- grep-2.10.orig/tests/reversed-range-endpoints 2011-09-10 13:17:04.000000000 +0300 +++ grep-2.10.MinGW/tests/reversed-range-endpoints 2011-12-20 11:41:49.639534500 +0200 @@ -11,7 +11,7 @@ for prog in grep egrep 'grep -E'; do test $? = 2 || fail=1 # Remove "program_name: " prefix from actual output. - sed 's/^[a-z]*: //' out> k&& mv k out + sed 's/^\([a-z]:\)\{0,1\}[^: ]*: //' out> k&& mv k out compare out exp || fail=1 done diff -up -r grep-2.10.orig/tests/warn-char-classes grep-2.10.MinGW/tests/warn-char-classes --- grep-2.10.orig/tests/warn-char-classes 2011-09-10 13:17:04.000000000 +0300 +++ grep-2.10.MinGW/tests/warn-char-classes 2011-12-20 11:41:49.655159300 +0200 @@ -12,6 +12,7 @@ printf 'grep: character class syntax is grep '[:space:]' x 2> err test $? = 2 || fail=1 +sed 's/^\([a-z]:\)\{0,1\}[^: ]*: /grep: /' err> err1&& mv err1 err compare err exp-err || fail=1 grep '[[:space:]]' x 2> err
Applied with [A-Za-z] in the sed commands. Paolo
