Add test for diff -u to RunGrepTest.

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

1 files changed, 12 insertions, 2 deletions

diff --git a/RunGrepTest b/RunGrepTest
index 1872e9c..6cbd2cc 100755
--- a/RunGrepTest
+++ b/RunGrepTest
@@ -14,9 +14,7 @@ echo " "
 echo "Testing pcregrep"
 $pcregrep -V
 
-cf="diff -ub"
 valgrind=
-
 while [ $# -gt 0 ] ; do
   case $1 in
     valgrind) valgrind="valgrind -q --leak-check=no";;
@@ -25,6 +23,18 @@ while [ $# -gt 0 ] ; do
   shift
 done
 
+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.
+
+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 
+  if diff -b /dev/null /dev/null; then cf="diff -b"; else cf="diff"; fi
+fi
+
 # If PCRE has been built in a directory other than the source directory, and
 # this test is being run from "make check" as usual, then $(srcdir) will be
 # set. If not, set it to the current directory. We then arrange to run the