From c0ed084e7d6551d2dda105c98a71d75969580a14 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 28 Nov 2004 15:25:01 +0000 Subject: [PATCH] * src/sanity/style.test: Make sure grep supports the options put into GREP_OPTIONS. --- ChangeLog | 3 +++ src/sanity/style.test | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42f2ce36f..d5146f349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-28 Alexandre Duret-Lutz + * src/sanity/style.test: Make sure grep supports the options put + into GREP_OPTIONS. + * wrap/python/tests/run.in: Define DYLD_LIBRARY_PATH so that Darwin finds non-installed libraries. Report from Akim Demaille. diff --git a/src/sanity/style.test b/src/sanity/style.test index 446d7b055..f771c4cb1 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -15,10 +15,12 @@ diag() rm -f failures # Get some help from GNU grep. -GREP_OPTIONS='--color=auto -n' -GREP_COLOR='1;31' -export GREP_OPTIONS -export GREP_COLOR +if (grep --color=auto -n --version)>/dev/null 2>&1; then + GREP_OPTIONS='--color=auto -n' + GREP_COLOR='1;31' + export GREP_OPTIONS + export GREP_COLOR +fi tmp=incltest.tmp