* lib/am/dejagnu.am (site.exp): Don't define tool in site.exp,

  because we set that by invoking runtest with --tool.
* tests/Makefile.am (TESTS): Add dejagnu4.test, dejagnu5.test,
  dejagnu6.test, dejagnu7.test.
* tests/dejagnu4.test: New test.
* tests/dejagnu5.test: New test.
* tests/dejagnu6.test: New test.
* tests/dejagnu7.test: New test.

* tests/dejagnu3.test: Make sure the DejaGnu test is actually run.

1 files changed, 64 insertions, 0 deletions

diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
new file mode 100755
index 000000000..ab83e4c95
--- /dev/null
+++ b/tests/dejagnu6.test
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with autoconf; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Check that "make check" fails, when a DejaGnu test fails.
+
+required=runtest
+. ./defs || exit 1
+
+set -e
+
+cat > faildeja << 'END'
+#! /bin/sh
+echo whatever
+END
+
+chmod +x faildeja
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+
+DEJATOOL = faildeja
+
+AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja
+END
+
+mkdir faildeja.test
+
+cat > faildeja.test/faildeja.exp << 'END'
+set test test
+spawn $FAILDEJA
+expect {
+    default { fail "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check && exit 1
+test -f faildeja.log
+test -f faildeja.sum
+$FGREP 'FAIL: test' faildeja.sum