Revision: 837
http://vcs.pcre.org/viewvc?view=rev&revision=837
Author: ph10
Date: 2011-12-29 17:25:26 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Fix msys RunGrepTest failure (Bugzilla #1185).
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/RunGrepTest
Added Paths:
-----------
code/trunk/testdata/greppatN4
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2011-12-28 17:16:11 UTC (rev 836)
+++ code/trunk/ChangeLog 2011-12-29 17:25:26 UTC (rev 837)
@@ -26,6 +26,10 @@
6. Add support for 16-bit character strings (a large amount of work involving
many changes and refactorings).
+7. RunGrepTest failed on msys because \r\n was replaced by whitespace when the
+ command "pattern=`printf 'xxx\r\njkl'`" was run. The pattern is now taken
+ from a file.
+
Version 8.21 12-Dec-2011
------------------------
Modified: code/trunk/RunGrepTest
===================================================================
--- code/trunk/RunGrepTest 2011-12-28 17:16:11 UTC (rev 836)
+++ code/trunk/RunGrepTest 2011-12-29 17:25:26 UTC (rev 837)
@@ -454,8 +454,7 @@
$valgrind $pcregrep -n --newline=cr -F "$pattern" testNinput >>testtry
printf "%c--------------------------- Test N4 ------------------------------\r\n" - >>testtry
-pattern=`printf 'xxx\r\njkl'`
-$valgrind $pcregrep -n --newline=crlf -F "$pattern" testNinput >>testtry
+$valgrind $pcregrep -n --newline=crlf -F -f testdata/greppatN4 testNinput >>testtry
printf "%c--------------------------- Test N5 ------------------------------\r\n" - >>testtry
$valgrind $pcregrep -n --newline=any "^(abc|def|ghi|jkl)" testNinput >>testtry
Added: code/trunk/testdata/greppatN4
===================================================================
--- code/trunk/testdata/greppatN4 (rev 0)
+++ code/trunk/testdata/greppatN4 2011-12-29 17:25:26 UTC (rev 837)
@@ -0,0 +1,2 @@
+xxx
+jkl
\ No newline at end of file
