X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftrace.t;h=0d8191e53d840fd18ae4080ed598ffd7fdc09d3a;hb=8516a2f454820d8aad0897f6bec7e37ecd94dcc0;hp=ab3a490b0a495f4422a1c0be23b4988de3dcaf22;hpb=020d9b767a668331a424cb7282bbff0513fb7f4f;p=p5sagit%2FApp-FatPacker.git

diff --git a/t/trace.t b/t/trace.t
index ab3a490..0d8191e 100644
--- a/t/trace.t
+++ b/t/trace.t
@@ -1,4 +1,3 @@
-#!perl
 use strict;
 use warnings FATAL => 'all';
 use Test::More qw(no_plan);
@@ -6,6 +5,7 @@ use Test::More qw(no_plan);
 test_trace("t/mod/a.pm" => ("t/mod/b.pm", "t/mod/c.pm"));
 test_trace("t/mod/b.pm" => ("t/mod/c.pm"));
 test_trace("t/mod/c.pm" => ());
+test_trace("t/mod/d.pl" => ("t/mod/d.pm"));
 
 # Attempts to conditionally load a module that isn't present
 test_trace("t/mod/cond.pm" => ());
@@ -14,37 +14,13 @@ sub test_trace {
   my($file, @loaded) = @_;
   local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-  system($^X, "-Mblib", "-MApp::FatPacker::Trace", $file);
-
-  open my $trace, "<", "fatpacker.trace";
-  while(<$trace>) {
-    chomp;
-    my $load = $_;
-    @loaded = grep { $load ne $_ } @loaded;
-  }
-
-  ok !@loaded, "All expected modules loaded for $file";
   unlink "fatpacker.trace";
-}
-
-test_trace("t/mod/a.pm" => ("t/mod/b.pm", "t/mod/c.pm"));
-
-sub test_trace_stderr {
-  my($file, @loaded) = @_;
-  local $Test::Builder::Level = $Test::Builder::Level + 1;
-
-  system(join(' ',
-    $^X, "-Mblib", "-MApp::FatPacker::Trace", '--to-stderr', $file,
-    '>', 'fatpacker.trace', '2>&1'));
+  system($^X, "-Mblib", "-MApp::FatPacker::Trace", $file);
 
   open my $trace, "<", "fatpacker.trace";
-  while(<$trace>) {
-    chomp;
-    my $load = $_;
-    @loaded = grep { $load ne $_ } @loaded;
-  }
+  my @traced = sort map { chomp; $_ } <$trace>;
+  close $trace;
 
-  ok !@loaded, "All expected modules loaded for $file";
+  is_deeply \@traced, \@loaded, "All expected modules loaded for $file";
   unlink "fatpacker.trace";
 }
-