X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F12_merge.t;h=c654359028add1255c2fed520148b1cc6af07566;hb=1c4ce01f78b112c2247a08f1a0dc9efb5ab3adca;hp=f07b4e65ac0b68e3ea762f00ec01b1bb0d5e2fd7;hpb=7c8a9cd6f350a94823fedde4dc6daa42f91b846d;p=debbugs.git

diff --git a/t/12_merge.t b/t/12_merge.t
index f07b4e6..c654359 100644
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -24,25 +24,14 @@ use Data::Dumper;
 
 # HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here.
 $SIG{CHLD} = sub {};
-my %config;
-eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
-};
-if ($@) {
-     BAIL_OUT($@);
-}
+my %config = create_debbugs_configuration();
+
 
 my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-	  diag("spool_dir:   $spool_dir\n");
-	  diag("config_dir:   $config_dir\n");
-	  diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.