[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1020-gf5c5453

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

The branch, test-protocols has been updated
       via  f5c5453039bd46bc54023c1f0434c167624aba5b (commit)
      from  a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    6 ++++
 tests/Makefile.am                                  |    1 +
 ...ror.test => tap-missing-plan-and-bad-exit.test} |   31 +++++++------------
 3 files changed, 19 insertions(+), 19 deletions(-)
 copy tests/{tap-no-disable-hard-error.test => 
tap-missing-plan-and-bad-exit.test} (65%)

diff --git a/ChangeLog b/ChangeLog
index bf629e1..2cb53d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-14  Stefano Lattarini  <address@hidden>
+
+       coverage: missing tap plan and non-zero exit status
+       * tests/tap-missing-plan-and-bad-exit.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
 2011-08-12  Stefano Lattarini  <address@hidden>
 
        testsuite: fix an unportable use of sed
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7af1eb6..59a6d14 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1177,6 +1177,7 @@ tap-plan.test \
 tap-plan-corner.test \
 tap-plan-errors.test \
 tap-plan-middle.test \
+tap-missing-plan-and-bad-exit.test \
 tap-planskip.test \
 tap-planskip-late.test \
 tap-planskip-and-logging.test \
diff --git a/tests/tap-no-disable-hard-error.test 
b/tests/tap-missing-plan-and-bad-exit.test
similarity index 65%
copy from tests/tap-no-disable-hard-error.test
copy to tests/tap-missing-plan-and-bad-exit.test
index 678e184..48c6fcc 100755
--- a/tests/tap-no-disable-hard-error.test
+++ b/tests/tap-missing-plan-and-bad-exit.test
@@ -15,36 +15,29 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # TAP support:
-#  - "Bail out!" magic and TAP parse errors are not disabled nor turned
-#    into simple failures by the definition DISABLE_HARD_ERRORS.
+#  - if a test script exits with non-zero status before printing the TAP
+#    plan, then the driver reports both "missing plan" and "exited with
+#    non-zero status" errors.
 
 parallel_tests=yes
 . ./defs || Exit 1
 
-cat > Makefile.am << 'END'
-DISABLE_HARD_ERRORS = yes
-TEST_LOG_COMPILER = cat
-TESTS = bail.test few.test noplan.test
+cat > foo.test <<END
+#!/bin/sh
+exit 123
 END
 
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
-
-cat > bail.test <<END
-1..1
-Bail out!
-END
+echo TESTS = foo.test > Makefile.am
 
-cat > few.test <<END
-1..1
-END
+chmod a+x foo.test
 
-cat > noplan.test <<END
-# nothing here
-END
+. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
 
 $MAKE check >stdout && { cat stdout; Exit 1; }
 cat stdout
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=2
 
-count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3
+grep '^ERROR: foo\.test - exited with status 123$' stdout
+grep '^ERROR: foo\.test - missing test plan$' stdout
 
 :


hooks/post-receive
-- 
GNU Automake