summaryrefslogtreecommitdiff
path: root/RunGrepTest
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-12-31 15:19:04 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-12-31 15:19:04 +0000
commit74eb3434599c95a3ee8a52dcd9a5d3a62946dc23 (patch)
tree788a07031b25597cf42d94badf2d9fc2edc9a09f /RunGrepTest
parent1b855e2c5e3447b1d6ea7d9301988828141ce3c4 (diff)
downloadpcre-74eb3434599c95a3ee8a52dcd9a5d3a62946dc23.tar.gz
Typos in PrepareRelease; include 16-bit in make distcheck; fix RunTest and
RunGrepTest when building in non-source directory; problem in pcretest when no UTF or 16-bit support; other tidies consequent on building a tarball. git-svn-id: svn://vcs.exim.org/pcre/code/trunk@842 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'RunGrepTest')
-rwxr-xr-xRunGrepTest5
1 files changed, 3 insertions, 2 deletions
diff --git a/RunGrepTest b/RunGrepTest
index 79c9fe6..fecc06e 100755
--- a/RunGrepTest
+++ b/RunGrepTest
@@ -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.
@@ -454,7 +455,7 @@ pattern=`printf 'def\rjkl'`
$valgrind $pcregrep -n --newline=cr -F "$pattern" testNinput >>testtry
printf "%c--------------------------- Test N4 ------------------------------\r\n" - >>testtry
-$valgrind $pcregrep -n --newline=crlf -F -f testdata/greppatN4 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