X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F08_pkgreport.t;h=5a3339062f2beba78e0124ebd877f70505c5521c;hb=210f625e6e6b4cbe1065f35d9eb0bdc73563969c;hp=df4861d9d0f22f7cd87e5cdae63c4e8796b8360f;hpb=1f71fe821a9cd7f83fc0658eb97c43576eb8a29e;p=debbugs.git

diff --git a/t/08_pkgreport.t b/t/08_pkgreport.t
index df4861d..5a33390 100644
--- a/t/08_pkgreport.t
+++ b/t/08_pkgreport.t
@@ -23,22 +23,8 @@ use Test::WWW::Mechanize;
 use lib qw(t/lib);
 use DebbugsTest qw(:all);
 
-my %config;
-eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
-};
-if ($@) {
-     BAIL_OUT($@);
-}
-
-# Output some debugging information if there's an error
-END{
-     if ($ENV{DEBUG}) {
-	  foreach my $key (keys %config) {
-	       diag("$key: $config{$key}\n");
-	  }
-     }
-}
+my %config = create_debbugs_configuration();
+
 
 # create a bug
 send_message(to=>'submit@bugs.something',
@@ -60,8 +46,7 @@ EOF
 my $pkgreport_cgi_handler = sub {
      # I do not understand why this is necessary.
      $ENV{DEBBUGS_CONFIG_FILE} = "$config{config_dir}/debbugs_config";
-     # We cd here because pkgreport uses require ./common.pl
-     my $content = qx(cd cgi; perl -I.. -T pkgreport.cgi);
+     my $content = qx(perl -Ilib -T cgi/pkgreport.cgi);
      # Strip off the Content-Type: stuff
      $content =~ s/^\s*Content-Type:[^\n]+\n*//si;
      print $content;