X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Finstall.t;h=1ee35d02f922d211598cae5df617ed4667115705;hb=73c9a8add20f699a4aa29bf814ddad0b5cfd440c;hp=100834fa45cabe54812d4dc839ac14e0dfd15052;hpb=5da9706a04aec9da59a228cabbb3ac78b962a480;p=p5sagit%2Flocal-lib.git

diff --git a/t/install.t b/t/install.t
index 100834f..1ee35d0 100644
--- a/t/install.t
+++ b/t/install.t
@@ -4,20 +4,21 @@ use Test::More;
 BEGIN { plan skip_all => "Install Capture::Tiny to test installation"
   unless eval { require Capture::Tiny; 1 } }
 use Capture::Tiny qw(capture);
-use File::Temp qw(tempdir);
 use File::Spec;
 use Cwd;
 use Config;
 
+use lib 't/lib'; use TempDir;
+
 plan tests => 2;
 
-my $dir = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
+my $dir = mk_temp_dir('test_local_lib-XXXXX');
 
 use local::lib ();
 local::lib->import($dir);
 
 my $orig_dir = cwd;
-SKIP: for my $dist_type (qw(EUMM MB)) {
+SKIP: for my $dist_type (qw(MB EUMM)) {
   chdir File::Spec->catdir($orig_dir, qw(t dist), $dist_type);
   if ($dist_type eq 'EUMM') {
     my ($stdout, $stderr) = capture { eval {
@@ -35,6 +36,10 @@ SKIP: for my $dist_type (qw(EUMM MB)) {
   my $file = File::Spec->catfile($dir, qw(lib perl5), "$dist_type.pm");
   ok(
     -e $file,
-    "$dist_type.pm installed as $file",
-  );
+    "$dist_type - $dist_type.pm installed as $file",
+  )
+  or do {
+        my $dest_dir = File::Spec->catdir($dir, qw(lib perl5));
+        diag 'Files in ' . $dest_dir . ":\n", join("\n", glob(File::Spec->catfile($dest_dir, '*')));
+  };
 }