[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1037-g11d8ed5

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=11d8ed522235c2e5c705d6345e7cd55f2a47b316

The branch, test-protocols has been updated
       via  11d8ed522235c2e5c705d6345e7cd55f2a47b316 (commit)
       via  90c6fc18d1b1129e3ced36ddcd7a7ab0899294ad (commit)
      from  40705c5cc5898ff924fea0c6f54f8953205a630d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11d8ed522235c2e5c705d6345e7cd55f2a47b316
Author: Stefano Lattarini <address@hidden>
Date:   Sat Aug 20 13:59:45 2011 +0200

    cosmetics: fix botched indentation in perl TAP driver
    
    * lib/tap-driver.pl (main, Getopt::Long::GetOptions): Fix
    improper or botched indentation.

commit 90c6fc18d1b1129e3ced36ddcd7a7ab0899294ad
Author: Stefano Lattarini <address@hidden>
Date:   Sat Aug 20 14:00:25 2011 +0200

    fix: regenerate tests/Makefile.in

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    6 ++++++
 lib/tap-driver.pl |   31 ++++++++++++++++---------------
 tests/Makefile.in |    3 ++-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdccc31..c64cf6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-20  Stefano Lattarini  <address@hidden>
 
+       cosmetics: fix botched indentation in perl TAP driver
+       * lib/tap-driver.pl (main, Getopt::Long::GetOptions): Fix
+       improper or botched indentation.
+
+2011-08-20  Stefano Lattarini  <address@hidden>
+
        coverage: some more tests on corner cases of TAP support
        * tests/tap-no-spurious.test: Extend checks verifying that a line
        matching, say, the regex "^ok[a-zA-Z0-9_]" is *not* considered a
diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl
index 7043815..9e1ece4 100755
--- a/lib/tap-driver.pl
+++ b/lib/tap-driver.pl
@@ -73,7 +73,8 @@ my $log_file = undef;
 my $trs_file = undef;
 my $diag_string = "#";
 
-Getopt::Long::GetOptions (
+Getopt::Long::GetOptions
+  (
     'help' => sub { print $HELP; exit 0; },
     'version' => sub { print "$ME $VERSION\n"; exit 0; },
     'test-name=s' => \$test_script_name,
@@ -450,22 +451,22 @@ sub main (@)
   if (!$bailed_out)
     {
       if (!$plan_seen)
-      {
-        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";
-        testsuite_error (sprintf "too %s tests run (expected %d, got %d)",
-                                 $bad_amount, $planned, $run);
-      }
+        {
+          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";
+          testsuite_error (sprintf "too %s tests run (expected %d, got %d)",
+                                   $bad_amount, $planned, $run);
+        }
     }
   if (!$cfg{"ignore-exit"} && !$bailed_out)
-  {
-    my $msg = get_test_exit_message ();
-    testsuite_error $msg if $msg;
-  }
+    {
+      my $msg = get_test_exit_message ();
+      testsuite_error $msg if $msg;
+    }
   write_test_results;
   close LOG or die "closing $log_file: $!\n";
   exit 0;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 96edc94..c6ca939 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1425,7 +1425,9 @@ tap-plan.test \
 tap-plan-corner.test \
 tap-plan-errors.test \
 tap-plan-middle.test \
+tap-plan-whitespace.test \
 tap-plan-leading-zero.test \
+tap-plan-malformed.test \
 tap-missing-plan-and-bad-exit.test \
 tap-planskip.test \
 tap-planskip-late.test \
@@ -1436,7 +1438,6 @@ tap-planskip-whitespace.test \
 tap-planskip-badexit.test \
 tap-planskip-bailout.test \
 tap-planskip-later-errors.test \
-tap-planskip-malformed.test \
 tap-realtime.test \
 tap-recheck-logs.test \
 tap-todo-skip-together.test \


hooks/post-receive
-- 
GNU Automake