42 lines
1.3 KiB
Plaintext
42 lines
1.3 KiB
Plaintext
--- RunGrepTest.in
|
|
+++ RunGrepTest.in 2007/01/18 08:01:45
|
|
@@ -139,7 +139,7 @@
|
|
echo "RC=$?" >>testtry
|
|
|
|
echo "---------------------------- Test 36 -----------------------------" >>testtry
|
|
-$valgrind ./pcregrep -L -r --include=grepinput --exclude 'grepinput$' 'fox' $testdata >>testtry
|
|
+$valgrind ./pcregrep -L -r --include=grepinput --exclude 'grepinput$' 'fox' $testdata | sort >>testtry
|
|
echo "RC=$?" >>testtry
|
|
|
|
echo "---------------------------- Test 37 -----------------------------" >>testtry
|
|
--- pcrecpp.cc
|
|
+++ pcrecpp.cc 2007/02/09 09:12:11
|
|
@@ -356,8 +356,13 @@
|
|
newline_mode = PCRE_NEWLINE_CR;
|
|
else if (newline == 3338)
|
|
newline_mode = PCRE_NEWLINE_CRLF;
|
|
- else
|
|
- assert("" == "Unexpected return value from pcre_config(NEWLINE)");
|
|
+ else {
|
|
+ fprintf (stderr,
|
|
+ "Unexpected return value from pcre_config(NEWLINE) -> %d\n",
|
|
+ newline
|
|
+ );
|
|
+ abort();
|
|
+ }
|
|
}
|
|
return newline_mode;
|
|
}
|
|
--- testdata/grepoutput
|
|
+++ testdata/grepoutput 2007/01/18 08:01:45
|
|
@@ -342,8 +342,8 @@
|
|
./testdata/grepinputx
|
|
RC=0
|
|
---------------------------- Test 36 -----------------------------
|
|
-./testdata/grepinputx
|
|
./testdata/grepinput8
|
|
+./testdata/grepinputx
|
|
RC=0
|
|
---------------------------- Test 37 -----------------------------
|
|
aaaaa0
|