diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-08-15 16:45:36 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-08-15 16:45:36 +0000 |
| commit | e5aae0d579e12d0eb2e22a6e2fcb0042ba2be0fd (patch) | |
| tree | 50e19e340c02d2ac5e02337445ac14b71b6f8d87 /RunGrepTest | |
| parent | db525ce55e5979dfb31209e0019d171216b19545 (diff) | |
| download | pcre-e5aae0d579e12d0eb2e22a6e2fcb0042ba2be0fd.tar.gz | |
Fix a number of issues in pcregrep.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1003 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'RunGrepTest')
| -rwxr-xr-x | RunGrepTest | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/RunGrepTest b/RunGrepTest index 706c777..2494088 100755 --- a/RunGrepTest +++ b/RunGrepTest @@ -119,7 +119,8 @@ echo "---------------------------- Test 12 -----------------------------" >>test echo "RC=$?" >>testtry echo "---------------------------- Test 13 -----------------------------" >>testtry -(cd $srcdir; $valgrind $pcregrep -f./testdata/greplist ./testdata/grepinputx) >>testtry +echo seventeen >testtemp1 +(cd $srcdir; $valgrind $pcregrep -f./testdata/greplist -f testtemp1 ./testdata/grepinputx) >>testtry echo "RC=$?" >>testtry echo "---------------------------- Test 14 -----------------------------" >>testtry @@ -207,11 +208,11 @@ echo "---------------------------- Test 34 -----------------------------" >>test echo "RC=$?" >>testtry echo "---------------------------- Test 35 -----------------------------" >>testtry -(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinputx --exclude-dir='^\.' 'fox' ./testdata) >>testtry +(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinputx --include grepinput8 --exclude-dir='^\.' 'fox' ./testdata) >>testtry echo "RC=$?" >>testtry echo "---------------------------- Test 36 -----------------------------" >>testtry -(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinput --exclude 'grepinput$' --exclude_dir='^\.' 'fox' ./testdata | sort) >>testtry +(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinput --exclude 'grepinput$' --exclude=grepinput8 --exclude-dir='^\.' 'fox' ./testdata | sort) >>testtry echo "RC=$?" >>testtry echo "---------------------------- Test 37 -----------------------------" >>testtry @@ -408,7 +409,8 @@ echo "---------------------------- Test 83 -----------------------------" >>test echo "RC=$?" >>testtry echo "---------------------------- Test 84 -----------------------------" >>testtry -(cd $srcdir; $valgrind $pcregrep --file-list ./testdata/grepfilelist "fox|complete") >>testtry 2>&1 +echo testdata/grepinput3 >testtemp1 +(cd $srcdir; $valgrind $pcregrep --file-list ./testdata/grepfilelist --file-list testtemp1 "fox|complete|t7") >>testtry 2>&1 echo "RC=$?" >>testtry echo "---------------------------- Test 85 -----------------------------" >>testtry @@ -447,6 +449,36 @@ echo "---------------------------- Test 93 -----------------------------" >>test (cd $srcdir; $valgrind $pcregrep --text "dog" ./testdata/grepbinary) >>testtry 2>&1 echo "RC=$?" >>testtry +echo "---------------------------- Test 94 -----------------------------" >>testtry +(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinputx --include grepinput8 'fox' ./testdata/grepinput*) >>testtry +echo "RC=$?" >>testtry + +echo "---------------------------- Test 95 -----------------------------" >>testtry +(cd $srcdir; $valgrind $pcregrep --file-list ./testdata/grepfilelist --exclude grepinputv "fox|complete") >>testtry 2>&1 +echo "RC=$?" >>testtry + +echo "---------------------------- Test 96 -----------------------------" >>testtry +(cd $srcdir; $valgrind $pcregrep -L -r --include-dir=testdata --exclude '^(?!grepinput)' 'fox' ./test*) >>testtry +echo "RC=$?" >>testtry + +echo "---------------------------- Test 97 -----------------------------" >>testtry +echo "grepinput$" >testtemp1 +echo "grepinput8" >>testtemp1 +(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinput --exclude-from testtemp1 --exclude-dir='^\.' 'fox' ./testdata | sort) >>testtry +echo "RC=$?" >>testtry + +echo "---------------------------- Test 98 -----------------------------" >>testtry +echo "grepinput$" >testtemp1 +echo "grepinput8" >>testtemp1 +(cd $srcdir; $valgrind $pcregrep -L -r --exclude=grepinput3 --include=grepinput --exclude-from testtemp1 --exclude-dir='^\.' 'fox' ./testdata | sort) >>testtry +echo "RC=$?" >>testtry + +echo "---------------------------- Test 99 -----------------------------" >>testtry +echo "grepinput$" >testtemp1 +echo "grepinput8" >testtemp2 +(cd $srcdir; $valgrind $pcregrep -L -r --include grepinput --exclude-from testtemp1 --exclude-from=testtemp2 --exclude-dir='^\.' 'fox' ./testdata | sort) >>testtry +echo "RC=$?" >>testtry + # Now compare the results. $cf $srcdir/testdata/grepoutput testtry |