# HG changeset patch
# User Matthias Förste <foerste@schlittermann.de>
# Date 1309445015 -7200
# Node ID 0f2ea27e9e1813468ae6fbe6bb609ff4a36debbb
# Parent  c33217cb59896a6a8dbed92c5bb10a1546dc5715# Parent  af27be0a326b80e75c2700f7d6e663cb20a696f5
merged back fixes

diff -r c33217cb5989 -r 0f2ea27e9e18 t/02-dnssec-keytool.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/t/02-dnssec-keytool.t	Thu Jun 30 16:43:35 2011 +0200
@@ -0,0 +1,43 @@
+use strict;
+use warnings;
+
+use lib 't/lib';
+use Aux;
+
+use Test::More;
+use File::Temp qw(tempdir);
+use Net::LibIDN qw(:all);
+
+# older versions of Test::More (debian lenny fex) don't know done_testing
+Test::More->import('no_plan') unless defined &done_testing;
+
+my $zone = "müller.de";
+my $CMD = "perl -Mblib blib/sbin/dnssec-keytool";
+
+system("$CMD -h >/dev/null 2>&1");
+is($? => 0, "exit on help");
+
+system("$CMD -m >/dev/null 2>&1");
+is($? => 0, "exit on man");
+
+system("$CMD >/dev/null 2>&1");
+ok($? > 0, "error on missing args");
+
+#$_ = File::Temp::tempdir CLEANUP => 1 or die "Can't make temporary directory" for my ($master_dir, $config_dir);
+my $tmp = Aux::make_config;
+$ENV{DNSTOOLS_CONF} = $tmp->filename;
+
+system("perl -Mblib blib/sbin/zone-mk xxx $zone >/dev/null 2>&1");
+die "zone creation failed" if $?;
+
+system("$CMD --ksk $zone >/dev/null 2>&1");
+is($? => 0, 'exit on --ksk');
+
+system("$CMD --zsk $zone >/dev/null 2>&1");
+is($? => 0, 'exit on --zsk');
+
+system("$CMD --rm $zone >/dev/null 2>&1");
+is($? => 0, 'exit on --rm');
+
+# older versions of Test::More (debian lenny fex) don't know done_testing
+if (defined &done_testing) { &done_testing; }
diff -r c33217cb5989 -r 0f2ea27e9e18 t/lib/Aux.pm
--- a/t/lib/Aux.pm	Thu Jun 30 16:25:13 2011 +0200
+++ b/t/lib/Aux.pm	Thu Jun 30 16:43:35 2011 +0200
@@ -9,7 +9,7 @@
 our $VERSION   = 0.0;
 our @EXPORT_OK = qw(make_config);
 
-sub make_config($) {
+sub make_config {
 
     my ($c) = @_;
 
@@ -26,12 +26,7 @@
     else {
 
         # make a default configuration
-        my ( $bd, $md, $cd );
-        for ( $bd, $md, $cd ) {
-            my $d = File::Temp::tempdir CLEANUP => 1
-              or die "Can't make temporary directory";
-            $_ = $d->filename;
-        }
+        $_ = File::Temp::tempdir CLEANUP => 1 or die "Can't make temporary directory" for my ($bd, $md, $cd);
 
         print $f <<__EOF;
 bind_dir = $bd