summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-06-06 18:13:20 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-06-06 18:13:20 +0200
commit23c0341c11435c7b4b124be6c743eda585a93315 (patch)
tree61d7bb292bf085f640121fd612deb8d82b2ad9d8
parentaa5098642d7e55d5a9fa83998457d788b71798c0 (diff)
Write errors to STDERR
-rwxr-xr-xbin/efa16
-rw-r--r--test/50-efa.t12
2 files changed, 15 insertions, 13 deletions
diff --git a/bin/efa b/bin/efa
index aa82864..0c3392a 100755
--- a/bin/efa
+++ b/bin/efa
@@ -26,6 +26,7 @@ my $ignore_info = 'Fahrradmitnahme';
my ($test_dump, $test_parse);
binmode(STDOUT, ':utf8');
+binmode(STDERR, ':utf8');
sub check_ambiguous {
my ($full_tree) = @_;
@@ -36,13 +37,13 @@ sub check_ambiguous {
foreach my $select (@{$full_tree->findnodes($xp_select)}) {
$ambiguous = 1;
- printf(
+ printf {*STDERR} (
"Ambiguous input for %s\n",
$select->getAttribute('name'),
);
foreach my $val ($select->findnodes($xp_option)) {
- print "\t";
- say $val->textContent();
+ print {*STDERR} "\t";
+ say {*STDERR} $val->textContent();
}
}
if ($ambiguous) {
@@ -59,10 +60,10 @@ sub check_no_connections {
my $err_node = $full_tree->findnodes($xp_err_img)->[0];
if ($err_node) {
- say "Looks like efa.vrr.de showed an error.";
- say "I will now try to dump the error message:";
+ say {*STDERR} "Looks like efa.vrr.de showed an error.";
+ say {*STDERR} "I will now try to dump the error message:";
- say $err_node->parentNode()->parentNode()->textContent();
+ say {*STDERR} $err_node->parentNode()->parentNode()->textContent();
exit 2;
}
@@ -268,7 +269,8 @@ sub parse_tree {
return $cons;
}
else {
- say "efa.vrr.de returned no connections, check your input data.";
+ say {*STDERR}
+ "efa.vrr.de returned no connections, check your input data.";
exit 3;
}
}
diff --git a/test/50-efa.t b/test/50-efa.t
index ef97fb9..0c1d7ab 100644
--- a/test/50-efa.t
+++ b/test/50-efa.t
@@ -142,21 +142,21 @@ $cmd = Test::Command->new(
);
$cmd->exit_is_num(1);
-$cmd->stdout_is_file('test/parse_ambiguous');
-$cmd->stderr_is_eq($EMPTY);
+$cmd->stdout_is_eq($EMPTY);
+$cmd->stderr_is_file('test/parse_ambiguous');
$cmd = Test::Command->new(
cmd => "$efa $test_parse < test/dump_no_connections"
);
$cmd->exit_is_num(2);
-$cmd->stdout_is_file('test/parse_no_connections');
-$cmd->stderr_is_eq($EMPTY);
+$cmd->stdout_is_eq($EMPTY);
+$cmd->stderr_is_file('test/parse_no_connections');
$cmd = Test::Command->new(
cmd => "$efa $test_parse < test/dump_invalid_input"
);
$cmd->exit_is_num(3);
-$cmd->stdout_is_file('test/parse_invalid_input');
-$cmd->stderr_is_eq($EMPTY);
+$cmd->stdout_is_eq($EMPTY);
+$cmd->stderr_is_file('test/parse_invalid_input');