# HG changeset patch # User Matthias Förste # Date 1309439942 -7200 # Node ID f58169fe600a605c65c53280d71575798e1d22e2 # Parent be90bcd14ae1b5eaa666da66125371dc570239b4 make it working on both lenny and squeeze diff -r be90bcd14ae1 -r f58169fe600a t/01-zone-mk.t --- a/t/01-zone-mk.t Thu Jun 30 09:45:38 2011 +0200 +++ b/t/01-zone-mk.t Thu Jun 30 15:19:02 2011 +0200 @@ -8,21 +8,18 @@ use File::Temp qw(tempdir); use Net::LibIDN qw(:all); -# make it work with older versions of Test::More -unless (defined &done_testing) { -sub done_testing() {}; -use Test::More qw(no_plan); -} +# older versions of Test::More (debian lenny fex) don't know done_testing +Test::More->import('no_plan') unless defined &done_testing; my $CMD = "perl -Mblib blib/sbin/zone-mk"; -system("$CMD -h &>/dev/null"); +system("$CMD -h >/dev/null 2>&1"); is($? => 0, "exit on help"); -system("$CMD -m &>/dev/null"); +system("$CMD -m >/dev/null 2>&1"); is($? => 0, "exit on man"); -system("$CMD &>/dev/null"); +system("$CMD >/dev/null 2>&1"); ok($? > 0, "error on missing args"); @@ -34,7 +31,7 @@ template_dir => './templates' }; $ENV{DNSTOOLS_CONF} = $tmp->filename; -system("$CMD xxx müller.de &>/dev/null"); +system("$CMD xxx müller.de >/dev/null 2>&1"); is($? => 0, "created zone"); my $domain = idn_to_ascii("müller.de", "UTF-8"); @@ -42,4 +39,5 @@ ok(-s "$config_dir/$domain", "config file $domain"); -done_testing; +# older versions of Test::More (debian lenny fex) don't know done_testing +if (defined &done_testing) { &done_testing; }