--- embedaddon/pcre/RunGrepTest	2012/02/21 23:05:51	1.1.1.1
+++ embedaddon/pcre/RunGrepTest	2012/02/21 23:50:25	1.1.1.2
@@ -9,9 +9,10 @@
 LC_ALL=C
 export LC_ALL
 
-# Remove any non-default colouring that the caller may have set.
+# Remove any non-default colouring and aliases that the caller may have set.
 
 unset PCREGREP_COLOUR PCREGREP_COLOR
+unset cp ls mv rm
 
 # Set the program to be tested, and valgrind settings when requested.
 
@@ -66,7 +67,7 @@ fi
 
 # Check for the availability of UTF-8 support
 
-./pcretest -C | ./pcregrep "No UTF-8 support" >/dev/null
+./pcretest -C utf >/dev/null
 utf8=$?
 
 echo "---------------------------- Test 1 ------------------------------" >testtry
@@ -454,8 +455,7 @@ pattern=`printf 'def\rjkl'`
 $valgrind $pcregrep -n --newline=cr -F "$pattern" testNinput >>testtry
 
 printf "%c--------------------------- Test N4 ------------------------------\r\n" - >>testtry
-pattern=`printf 'xxx\r\njkl'`
-$valgrind $pcregrep -n --newline=crlf -F "$pattern" testNinput >>testtry
+$valgrind $pcregrep -n --newline=crlf -F -f $srcdir/testdata/greppatN4 testNinput >>testtry
 
 printf "%c--------------------------- Test N5 ------------------------------\r\n" - >>testtry
 $valgrind $pcregrep -n --newline=any "^(abc|def|ghi|jkl)" testNinput >>testtry