From ff37c9ba221b5b6e2bb365a438617113c89be6c9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 6 Aug 2011 20:23:54 +0200 Subject: [PATCH] cosmetics: typofix in the name of a function in the TAP driver * lib/tap-driver (testuite_error): Renamed ... (testsuite_error): ... to this, and minor related reformatting. --- ChangeLog | 6 ++++++ lib/tap-driver | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75ea7a23c..76ca19fd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-08-06 Stefano Lattarini + + cosmetics: typofix in the name of a function in the TAP driver + * lib/tap-driver (testuite_error): Renamed ... + (testsuite_error): ... to this, and minor related reformatting. + 2011-08-06 Stefano Lattarini tap: scripts with a SKIP plan but with exit status != 0 must error diff --git a/lib/tap-driver b/lib/tap-driver index d836b5f6c..508f5b317 100755 --- a/lib/tap-driver +++ b/lib/tap-driver @@ -106,7 +106,7 @@ sub peek_tap_line (); sub report ($;$); sub start (@); sub stringify_test_result ($); -sub testuite_error ($); +sub testsuite_error ($); sub unget_tap_line ($); sub write_test_results (); sub yn ($); @@ -247,7 +247,7 @@ sub finish () } else { - testuite_error $msg; + testsuite_error $msg; } } write_test_results; @@ -333,7 +333,7 @@ sub report ($;$) print $result . $msg; } -sub testuite_error ($) +sub testsuite_error ($) { report "ERROR", "- $_[0]"; } @@ -372,12 +372,12 @@ sub handle_tap_test ($) sub handle_tap_plan ($) { my $plan = shift; - testuite_error "multiple test plans" if $plan_seen; + testsuite_error "multiple test plans" if $plan_seen; $plan_seen = 1; # TAP plan must be either in the first or in the last line. if ($lineno > 1 && peek_tap_line) { - testuite_error "test plan in middle of output"; + testsuite_error "test plan in middle of output"; return; } # Nothing more to do, unless the plan contains a SKIP directive. @@ -393,7 +393,7 @@ sub handle_tap_bailout ($) { my ($bailout, $msg) = ($_[0], "Bail out!"); $msg .= " " . $bailout->explanation if $bailout->explanation; - testuite_error $msg; + testsuite_error $msg; finish; } @@ -437,14 +437,14 @@ sub main (@) } if (!$plan_seen) { - testuite_error "missing test plan"; + testsuite_error "missing test plan"; } elsif ($parser->tests_planned != $parser->tests_run) { my ($planned, $run) = ($parser->tests_planned, $parser->tests_run); my $bad_amount = $run > $planned ? "many" : "few"; - testuite_error (sprintf "too %s tests run (expected %d, got %d)", - $bad_amount, $planned, $run); + testsuite_error (sprintf "too %s tests run (expected %d, got %d)", + $bad_amount, $planned, $run); } finish; } -- 2.47.2