This doesn't apply cleanly to the latest SVN sources for M::B, perhaps
it's already been fixed there?
-Ken
On Tue, Aug 26, 2008 at 1:17 PM, Nicholas Clark <[EMAIL PROTECTED]> wrote:
>
> The tersest patch I can create that works with both the new and old formatting
> is appended.
>
> Nicholas Clark
>
> ==== //depot/perl/lib/Module/Build/t/basic.t#4 -
> /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/basic.t ====
> --- /tmp/tmp.58230.71 2008-08-26 19:15:45.000000000 +0100
> +++ /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/basic.t 2008-08-26
> 18:37:38.000000000 +0100
> @@ -112,7 +112,7 @@ SKIP: {
> $mb->add_to_cleanup('save_out');
> # Use uc() so we don't confuse the current test output
> like uc(stdout_of( sub {$mb->dispatch('test', verbose => 1)} )), qr/^OK
> \d/m;
> - like uc(stdout_of( sub {$mb->dispatch('test', verbose => 0)} )),
> qr/\.\.OK/;
> + like uc(stdout_of( sub {$mb->dispatch('test', verbose => 0)} )), qr/\.\.
> ?OK/;
>
> $mb->dispatch('realclean');
> $dist->clean;
> ==== //depot/perl/lib/Module/Build/t/compat.t#5 -
> /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/compat.t ====
> --- /tmp/tmp.58230.89 2008-08-26 19:15:45.000000000 +0100
> +++ /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/compat.t 2008-08-26
> 18:45:54.000000000 +0100
> @@ -175,7 +175,7 @@ ok $mb, "Module::Build->new_from_context
> ok $ran_ok, "make test without verbose ran ok";
> $output =~ s/^/# /gm; # Don't confuse our own test output
> like $output,
> - qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?(?:# \[[\d:]+\]\s*)?)# All
> tests/,
> + qr/(?:# .+basic(?:\.t )?\.+ ?ok\s+(?:[\d.]+\s*m?s\s*)?(?:#
> \[[\d:]+\]\s*)?)# All tests/,
> 'Should be non-verbose';
>
> $mb->delete_filetree($libdir);
> ==== //depot/perl/lib/Module/Build/t/test_type.t#3 -
> /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/test_type.t ====
> --- /tmp/tmp.58230.188 2008-08-26 19:15:45.000000000 +0100
> +++ /Volumes/Stuff/p4perl/perl/lib/Module/Build/t/test_type.t 2008-08-26
> 18:37:13.000000000 +0100
> @@ -69,7 +69,7 @@ is( $::x, 2, "called again");
> my $output = uc(stdout_of(
> sub {$mb->dispatch('testspecial', verbose => 0)}
> ));
> -like($output, qr/\.\.OK/);
> +like($output, qr/\.\. ?OK/);
>
> is($::x, 3, "called a third time");
>
>
