"Craig A. Berry" <[EMAIL PROTECTED]> writes:
> At 04:03 PM 3/1/00 -0500, lane @ DUPHY4.Physics.Drexel.Edu wrote:
>>"Craig A. Berry" <[EMAIL PROTECTED]> writes:
>> > The only patch that was omitted because of my patching skills I repeat here
>> > (still don't know why applying it failed):
>> >
>> > --- t/pragma/warn/pp_ctl.orig Tue Feb 29 12:43:44 2000
>> > +++ t/pragma/warn/pp_ctl Tue Feb 29 13:01:22 2000
>>
>>Did you look at the file to see if the patch failure made sense?
>>The usual problem I have with generating patches is translations
>>from tabs to spaces, but I generate the patches with
>> gnu_diff "-uBb" oldfile newfile >patchfile
>
> Your patch had extra space in front of the lines surrounding the change for
> some reason. Even applying with patch -l didn't work. Just curious, did
> this fix a test error?
Yes, there were complaints from pragma/warnings.t about a missing semicolon
after "fred()" ... so I added a bunch of 'em, just to make sure :-)
And the blank line between the EXPECT and the subsequent #### is NEEDED;
I see that your revised patch removes it.
In t/pragma/warnings.t, it splits out \n###### to get the individual
tests, then cuts out \nEXPECT\n to get the $expect stuff.
But if you don't have any lines between EXPECT and ###### then you
only get \nEXPECT and don't split; the EXPECT winds up at the tail end
of the test program snippet:
blah blah blah
fred();
EXPECT
I don't know...maybe that was the cause of the "semicolons" complaint.
> Here it is yet again after applying by hand and creating another diff.
>
> --- t/pragma/warn/pp_ctl_orig Wed Mar 1 17:52:37 2000
> +++ t/pragma/warn/pp_ctl Wed Mar 1 18:02:10 2000
> @@ -51,7 +51,7 @@
> fred() if $a++ < 200
> }
>
> - fred()
> + fred();
>
> (in cleanup) foo bar
> package Foo;
> @@ -182,7 +182,7 @@
> fred() if $a++ < 200
> }
>
> -fred()
> +fred();
> EXPECT
> Deep recursion on subroutine "main::fred" at - line 6.
> ########
> @@ -194,7 +194,7 @@
> fred() if $a++ < 200
> }
>
> -fred()
> +fred();
> EXPECT
need a blank line in here
> ########
> # pp_ctl.c
> [End of Patch.]
