X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate%2Funit_core_script_server-without_modules.t;h=0fdaa872f8b2b41599bdc9d5ad855451cd710c30;hp=af9601e6add2222d8ccfc5cc11d3d7f4f5a76bb5;hb=44cf095889e0f32e501830b3d3d279667146ea94;hpb=1b4b5aa5c77c42e7609089ea97d06779c2c22770

diff --git a/t/aggregate/unit_core_script_server-without_modules.t b/t/aggregate/unit_core_script_server-without_modules.t
index af9601e..0fdaa87 100644
--- a/t/aggregate/unit_core_script_server-without_modules.t
+++ b/t/aggregate/unit_core_script_server-without_modules.t
@@ -1,28 +1,35 @@
 use strict;
 use warnings;
 use FindBin qw/$Bin/;
+
+# Package::Stash::XS has a weird =~ XS invocation during its compilation
+# This interferes with @INC hooks that do rematcuing on their own on
+# perls before 5.8.7. Just use the PP version to work around this.
+BEGIN { $ENV{PACKAGE_STASH_IMPLEMENTATION} = 'PP' if $] < '5.008007' }
+
 use Test::More;
 use Try::Tiny;
 
 plan skip_all => "Need Test::Without::Module for this test"
     unless try { require Test::Without::Module; 1 };
 
-use Test::Without::Module qw(
-    Starman
+Test::Without::Module->import(qw(
+    Starman::Server
     Plack::Handler::Starman
     MooseX::Daemonize
     MooseX::Daemonize::Pid::File
     MooseX::Daemonize::Core
-);
+));
+
 require "$Bin/../aggregate/unit_core_script_server.t";
 
-no Test::Without::Module qw(
-    Starman
+Test::Without::Module->unimport(qw(
+    Starman::Server
     Plack::Handler::Starman
     MooseX::Daemonize
     MooseX::Daemonize::Pid::File
     MooseX::Daemonize::Core
-);
+));
 
 1;