[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-964-gf5cb063

[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=f5cb0635a837eb99591ac0356f242f0496f1ad0f

The branch, test-protocols has been updated
       via  f5cb0635a837eb99591ac0356f242f0496f1ad0f (commit)
       via  a0d4d97a740412add8673379f7b36b2a40f6418f (commit)
      from  4839ca9219b95a6155e4161438318ec0aca3aaef (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 f5cb0635a837eb99591ac0356f242f0496f1ad0f
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 5 14:27:12 2011 +0200

    maintcheck: fix spurious failure w.r.t. use of bare "exit"
    
    * tests/check12.test: Cosmetic changes to avoid triggering a
    spurious failure of the `sc_tests_Exit_not_exit' maintainer
    check.

commit a0d4d97a740412add8673379f7b36b2a40f6418f
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 5 14:16:19 2011 +0200

    check: update comments to reflect recent heavy changes
    
    * lib/am/check.am [%?PARALLEL_TESTS%]: Update the comments to
    reflect the recent changes.  Remove quite many comments that
    were merely duplicating excerpts from the Automake manual.

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

Summary of changes:
 ChangeLog          |   14 ++++++++++++++
 lib/am/check.am    |   31 ++++++-------------------------
 tests/check12.test |   16 ++++++++--------
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46e6f03..2342060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-08-05  Stefano Lattarini  <address@hidden>
 
+       maintcheck: fix spurious failure w.r.t. use of bare "exit"
+       * tests/check12.test: Cosmetic changes to avoid triggering a
+       spurious failure of the `sc_tests_Exit_not_exit' maintainer
+       check.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       check: update comments to reflect recent heavy changes
+       * lib/am/check.am [%?PARALLEL_TESTS%]: Update the comments to
+       reflect the recent changes.  Remove quite many comments that
+       were merely duplicating excerpts from the Automake manual.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
        check: small cleanups and refactorings in test harness and drivers
        * lib/tap-driver (yn): New subroutine, converts a boolean value to
        a "yes" or "no" string.
diff --git a/lib/am/check.am b/lib/am/check.am
index 95e9ac6..8340850 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -49,31 +49,12 @@ include inst-vars.am
 
 ## New parallel test driver.
 ##
-## This code is adapted from check.mk which was originally
-## written at EPITA/LRDE, further developed at Gostai, then made
-## its way from GNU coreutils to end up, largely rewritten, in
-## Automake.
-##
-## It provides special support for "unit tests", that is to say,
-## tests that (once run) no longer need to be re-compiled and
-## re-run at each "make check", unless their sources changed.  To
-## enable unit-test supports, set RECHECK_LOGS to empty.  In such a
-## setting, that heavily relies on correct dependencies, its users may
-## prefer to define EXTRA_PROGRAMS instead of check_PROGRAMS, because
-## it allows intertwined compilation and execution of the tests.
-## Sometimes this helps catching errors earlier (you don't have to
-## wait for all the tests to be compiled).
-##
-## Define TEST_SUITE_LOG to be the name of the global log to create.
-## Define TEST_LOGS to the set of logs to include in it.  It defaults
-## to $(TESTS), with `.test' and address@hidden@' removed, and `'.log'
-## appended.
-##
-## In addition to the magic "exit 77 means SKIP" feature (which was
-## imported from automake), there is a magic "exit 99 means ERROR" feature
-## which is useful if you need to issue a hard error no matter whether the
-## test is XFAIL or not.  You can disable this feature by setting the
-## variable DISABLE_HARD_ERRORS to a nonempty value.
+## The first version of the code here was adapted from check.mk, which was
+## originally written at EPITA/LRDE, further developed at Gostai, then made
+## its way from GNU coreutils to end up, largely rewritten, in Automake.
+## The current version is an heavy rewrite of that, to allow for support
+## of more test metadata, and the use of custom test derivers and protocols
+## (among them, TAP).
 
 # Restructured Text title and section.
 am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
diff --git a/tests/check12.test b/tests/check12.test
index 27d61f6..e36a94d 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -34,12 +34,12 @@ END
 
 cat > a.test << 'END'
 #!/bin/sh
-echo a.test: exit ${A_EXIT_STATUS-0}
+echo a.test: exit status: ${A_EXIT_STATUS-0}
 exit ${A_EXIT_STATUS-0}
 END
 cat > b.test << 'END'
 #!/bin/sh
-echo b.test: exit ${B_EXIT_STATUS-0}
+echo b.test: exit status: ${B_EXIT_STATUS-0}
 exit ${B_EXIT_STATUS-0}
 END
 chmod +x a.test b.test
@@ -174,10 +174,10 @@ for vpath in : false; do
     cat test-suite.log
     cat a.log
     cat b.log
-    grep '^a\.test: exit 0$' a.log
-    grep '^b\.test: exit 1$' b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 1$' b.log
     grep '^FAIL: b$' test-suite.log
-    grep '^b\.test: exit 1$' test-suite.log
+    grep '^b\.test: exit status: 1$' test-suite.log
     grep '^a\.test' test-suite.log && Exit 1
   else :; fi
 
@@ -197,10 +197,10 @@ for vpath in : false; do
     cat test-suite.log
     cat a.log
     cat b.log
-    grep '^a\.test: exit 0$' a.log
-    grep '^b\.test: exit 23$' b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 23$' b.log
     grep '^FAIL: b$' test-suite.log
-    grep '^b\.test: exit 23$' test-suite.log
+    grep '^b\.test: exit status: 23$' test-suite.log
     grep '^a\.test' test-suite.log && Exit 1
   else :; fi
   grep 'check-local failed :-(' local.log


hooks/post-receive
-- 
GNU Automake