Fix the test suite for MS-Windows.

* tests/include-exclude: Use --directories=skip, to avoid
gratuitous failures on systems that cannot grep directories.
* tests/reversed-range-endpoints: Don't reject program names with
leading directories and drive letters.
* tests/warn-char-classes: Likewise.

3 files changed, 3 insertions, 2 deletions

diff --git a/tests/include-exclude b/tests/include-exclude
index 12955c00..1093de9f 100755
--- a/tests/include-exclude
+++ b/tests/include-exclude
@@ -41,7 +41,7 @@ grep -r --include='a*'    . x > out || fail=1
 compare exp-a out || fail=1
 
 # --include (without --recursive) uses different code
-grep --include=a --exclude-dir=dir '^aaa$' x/* > out || fail=1
+grep --directories=skip --include=a --exclude-dir=dir '^aaa$' x/* > out || fail=1
 compare exp-a out || fail=1
 
 grep --exclude=- '^aaa$' - < x/a > out || fail=1
diff --git a/tests/reversed-range-endpoints b/tests/reversed-range-endpoints
index 92567245..87a3331a 100755
--- a/tests/reversed-range-endpoints
+++ b/tests/reversed-range-endpoints
@@ -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-Za-z]:\)\{0,1\}[^: ]*: //' out > k && mv k out
 
   compare exp out || fail=1
 done
diff --git a/tests/warn-char-classes b/tests/warn-char-classes
index 1b49b870..10690595 100755
--- a/tests/warn-char-classes
+++ b/tests/warn-char-classes
@@ -12,6 +12,7 @@ printf 'grep: character class syntax is [[:space:]], not [:space:]\n' \
 
 grep '[:space:]' x 2> err
 test $? = 2 || fail=1
+sed 's/^\([A-Za-z]:\)\{0,1\}[^: ]*: /grep: /' err > err1 && mv err1 err
 compare exp-err err || fail=1
 
 grep '[[:space:]]' x 2> err