Fix RunGrepTest colour bug.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@720 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 8 insertions, 2 deletions

diff --git a/RunGrepTest b/RunGrepTest
index 4f26e43..338040b 100755
--- a/RunGrepTest
+++ b/RunGrepTest
@@ -5,9 +5,16 @@
 # supported by pcregrep.
 
 # Set the C locale, so that sort(1) behaves predictably.
+
 LC_ALL=C
 export LC_ALL
 
+# Remove any non-default colouring that the caller may have set.
+
+unset PCREGREP_COLOUR PCREGREP_COLOR
+
+# Set the program to be tested, and valgrind settings when requested.
+
 pcregrep=`pwd`/pcregrep
 
 valgrind=
@@ -28,12 +35,11 @@ fi
 
 $pcregrep -V
 
-cf="diff -ub"
-
 # Set up a suitable "diff" command for comparison. Some systems have a diff
 # that lacks a -u option. Try to deal with this; better do the test for the -b
 # option as well.
 
+cf="diff -ub"
 if diff -u /dev/null /dev/null; then
   if diff -ub /dev/null /dev/null; then cf="diff -ub"; else cf="diff -u"; fi
 else