diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-04-20 16:24:15 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-04-20 16:24:15 +0000 |
| commit | f2bc3b45f3a28fec6837e07ada63b124df0720a4 (patch) | |
| tree | 3e22eca69686f017ce6f9cf120b7f34df194c44a | |
| parent | 9b1f146749e53de2d26f62a3b5ff8ba4290240e3 (diff) | |
| download | automake-f2bc3b45f3a28fec6837e07ada63b124df0720a4.tar.gz | |
* lib/am/dejagnu.am (check-DEJAGNU): Fail when at least one test
failed, instead of when the last one failed (PR automake/488).
Report from Paul Lunau.
* tests/dejagnu4.test: Update to expose this.
* THANKS: Update.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | lib/am/dejagnu.am | 10 | ||||
| -rwxr-xr-x | tests/dejagnu4.test | 11 |
4 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2006-04-20 Paul Lunau <temp@lunau.me.uk> (tiny change) + Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * lib/am/dejagnu.am (check-DEJAGNU): Fail when at least one test + failed, instead of when the last one failed (PR automake/488). + Report from Paul Lunau. + * tests/dejagnu4.test: Update to expose this. + * THANKS: Update. + 2006-04-19 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * lib/am/check.am (check-TESTS): Match XFAIL_TESTS delimited by @@ -206,6 +206,7 @@ Paul Berrevoets paul@swi.com Paul D. Smith psmith@BayNetworks.COM Paul Eggert eggert@twinsun.com Paul Jarc prj@po.cwru.edu +Paul Lunau temp@lunau.me.uk Paul Martinolich martinol@datasync.com Paul Thomas PTHOMAS@novell.com Pavel Roskin pavel_roskin@geocities.com diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 501b4082b..699640551 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003 +## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -58,11 +58,13 @@ check-DEJAGNU: site.exp ## If runtest can't be found, print a warning but don't die. It is ## pointless to cause a failure if the tests cannot be run at all. if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - l='$(DEJATOOL)'; for tool in $$l; do \ - $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ + if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + then :; else exit_status=1; fi; \ done; \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ - fi + fi; \ + exit $$exit_status ## ------------------- ## diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test index 6f06d3d24..c2163a616 100755 --- a/tests/dejagnu4.test +++ b/tests/dejagnu4.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -19,6 +19,7 @@ # Boston, MA 02110-1301, USA. # Check that the DejaGnu rules work for a simple program and test case. +# Also check PR 488: Failure of the first of several tools tested. required=runtest . ./defs || exit 1 @@ -86,3 +87,11 @@ test -f spanner.log test -f spanner.sum $MAKE distcheck + +# Test for PR 488. +sed 's/E\(verything\)/Not e\1/' hammer > thammer +mv thammer hammer +chmod +x hammer + +$MAKE check && exit 1 +: |