more cleanup

[p5sagit/local-lib.git] / t / install.t

diff --git a/t/install.t b/t/install.t
index 8c6727c..5a515c8 100644 (file)
--- a/t/install.t
+++ b/t/install.t
@@ -4,14 +4,15 @@ 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(DIR => Cwd::abs_path('t'), CLEANUP => 1);
+my $dir = mk_temp_dir('test_local_lib-XXXXX');
 
 use local::lib ();
 local::lib->import($dir);
@@ -20,7 +21,7 @@ my $orig_dir = cwd;
 SKIP: for my $dist_type (qw(EUMM MB)) {
   chdir File::Spec->catdir($orig_dir, qw(t dist), $dist_type);
   if ($dist_type eq 'EUMM') {
-    my ($stdout, $stderr) = capture { eval { 
+    my ($stdout, $stderr) = capture { eval {
       system($^X, 'Makefile.PL') && die "Makefile.PL failed";
       system($Config{make}, 'install') && die "$Config{make} install failed";
     } };
@@ -32,10 +33,9 @@ SKIP: for my $dist_type (qw(EUMM MB)) {
     } };
     diag $stdout, $stderr if $@;
   }
+  my $file = File::Spec->catfile($dir, qw(lib perl5), "$dist_type.pm");
   ok(
-    -e File::Spec->catfile(
-      $dir, qw(lib perl5), "$dist_type.pm",
-    ),
-    "$dist_type.pm installed into the correct location",
+    -e $file,
+    "$dist_type - $dist_type.pm installed as $file",
   );
 }