On Thu, Mar 01, 2007 at 12:39:57AM -0500, Daniel Richard G. wrote:
> On Wed, 2007 Feb 28 20:36:08 -0500, Bob Rossi wrote:
> >
> > Daniel, after I applied your patch I configured pcre with out any
> > special options. I ran 'make check' and got,
> >
> > --- testtry 2007-02-28 10:34:45.000000000 -0500
> > +++ ./testdata/grepoutput 2007-02-28 10:34:04.000000000 -0500
> > @@ -342,8 +342,8 @@
> > ./testdata/grepinputx
> > RC=0
> > ---------------------------- Test 36 -----------------------------
> > -./testdata/grepinput8
> > ./testdata/grepinputx
> > +./testdata/grepinput8
> > RC=0
> > ---------------------------- Test 37 -----------------------------
> > aaaaa0
> > FAIL: RunGrepTest
>
> Could you look at the testdata/grepoutput file in your tree? The relevant
> section should appear as
>
> RC=0
> ---------------------------- Test 36 -----------------------------
> ./testdata/grepinput8
> ./testdata/grepinputx
> RC=0
> ---------------------------- Test 37 -----------------------------
> aaaaa0
>
> It seems that your copy of the file has the "x" line before the "8" line,
> which suggests that for some odd reason patch(1) didn't do what it was
> supposed to.
>
> The correct file should MD5-hash to 351258ebfe22d595d066ba468e186aa9.
OK, I think I've screwed all of this up. :) I'm repatching everything.
Thanks for the tips everyone. After I redid everything, I still noticed
that pcre_compile.c fails to patch cleanly for me. Here is the .rej,
***************
*** 312,318 ****
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 40 */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 72- | */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 50 */
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 88- ¬ */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 60 */
--- 312,318 ----
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 40 */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 72- | */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 50 */
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 88- 95 */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 60 */
***************
*** 346,352 ****
0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 */
0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /* 72- | */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 */
- 0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /* 88- ¬ */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 */
--- 346,352 ----
0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 */
0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /* 72- | */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 */
+ 0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /* 88- 95 */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 */
> > while [ $# -gt 0 ] ; do
> > case $1 in
> > - valgrind) valgrind="valgrind -q --leak-check=no";;
> > + valgrind) valgrind="valgrind -q --leak-check=no";;
> >
> > Why did you change the above line?
>
> As Craig correctly surmised, my editor stripped out the trailing
> whitespace. Which should not have been there in the first place, and which
> we don't want in the finalized sources....
>
> Because the patch is already rather spammy, and it already intentionally
> deals with whitespace in other places, I think you'd be better served by
> diffing the original pcre-7.0 source with the patched copy using "diff
> -bu", or perhaps even a graphical diff utility (Quick plug: tkdiff is very
> nice for this).
Why o why do you want to change lines that have nothing to do with the
task at hand? This is a personal pet peeve of mine. :)
I'll just remove the lines myself.
> As for the other changes, Craig pretty much took the words out of my mouth
> :)
>
> > Anyways, I figured something from above might have helped shed some
> > light on why the test suite was failing. Did it pass for you?
>
> Yep! In fact, it was failing for me before my changes, because of the
> filesystem-order issue.
Thank you, I'll hopefully get this working soon.
Bob Rossi
