fixes to Makefile

[maypole.git] / t / cgi_maypole.t

diff --git a/t/cgi_maypole.t b/t/cgi_maypole.t
index 977201a638d2137b9f5bd2cdfd6bd9cb706b07f8..22a50b37046f09d9744caa8bc56c93a613175bbd 100644 (file)
--- a/t/cgi_maypole.t
+++ b/t/cgi_maypole.t
@@ -14,7 +14,8 @@ my $mock_maypole = new Test::MockModule('CGI::Maypole');
 my $mock_cgi = new Test::MockModule('CGI::Simple');
 $mock_cgi->mock(path_info => sub {
     delete $_[0]->{'.path_info'};
-    goto $mock_cgi->original('path_info')
+    my $orig_path_info = $mock_cgi->original('path_info');
+    goto $orig_path_info;
 });
 
 # run()
@@ -107,11 +108,13 @@ SKIP: {
     };
     diag $@ if $@;
 
-    $compare = join "\cM\cJ", 'Content-length: 12',
-        'X-bender: kiss my shiny metal ass',
+    my $CL = 'Content-length: 12';
+    my $XB = 'X-bender: kiss my shiny metal ass';
+    my $nl = "\cM\cJ";
+    my $re = join $nl, "($CL$nl$XB)|($XB$nl$CL)",
         'Content-Type: text/plain; charset=iso8859-1',
         '', 'Hello World!';
-    is($stdout, $compare, '... prints output, including custom headers');
+    like($stdout, qr/$re/, '... prints output, including custom headers');
 }
 
 # get_template_root()