* tests/defs.in: Handle required=runtest, to detect runtest from DejaGnu.

* tests/Makefile.am (TESTS): Add dejagnu3.test.
* tests/dejagnu3.test: New test.

diff --git a/ChangeLog b/ChangeLog
index 4203f403ba6446d18631255129320e6b6e862726..5d4bcb91cee469bae387809189c3d317508240bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-17  Richard Dawe  <rich@phekda.freeserve.co.uk>
+
+       * tests/defs.in: Handle required=runtest, to detect runtest
+       from DejaGnu.
+       * tests/Makefile.am (TESTS): Add dejagnu3.test.
+       * tests/dejagnu3.test: New test.
+
 2003-04-16  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (rule_define): If the user tries to override

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f7144e920809c8b87f181e55e2204fb0a92949d..3405a75d6beb95671c7f51a9e9ee52a549b6e513 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,6 +137,7 @@ defun.test \
 defun2.test \
 dejagnu.test \
 dejagnu2.test \
+dejagnu3.test \
 depacl2.test \
 depcomp.test \
 depcomp2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1287edc5ca1fb24686d22b30e88ea00edb6cc43d..7c34763780172c708adc0160a8ce3ef55406bf9e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -240,6 +240,7 @@ defun.test \
 defun2.test \
 dejagnu.test \
 dejagnu2.test \
+dejagnu3.test \
 depacl2.test \
 depcomp.test \
 depcomp2.test \

diff --git a/tests/defs.in b/tests/defs.in
index e0b7ad107d65bb34f4c716c8a3bcfdefcfda5506..c056aad5e2435bb157ad8bbc398f2e83f62c1ac9 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -138,6 +138,11 @@ then
        rm -rf $ro_dir_temp
        test $create_status = 0 && exit 77
        ;;
+      runtest)
+       # DejaGnu's runtest program.
+       echo "$me: running runtest --version"
+       (runtest --version) || exit 77
+       ;;
       tex)
         # No all versions of Tex support `--version', so we use
         # a configure check.

diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
new file mode 100755 (executable)
index 0000000..f9c9712
--- /dev/null
+++ b/tests/dejagnu3.test
@@ -0,0 +1,63 @@
+#! /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 the DejaGnu rules work for a simple program and test case.
+
+required=runtest
+. ./defs || exit 1
+
+set -e
+
+cat > hammer << 'END'
+#! /bin/sh
+echo "Everything looks like a nail to me!"
+END
+
+chmod +x hammer
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+
+DEJATOOL = hammer
+END
+
+mkdir testsuite
+mkdir testsuite/hammer.test
+
+cat > testsuite/hammer.test/hammer.exp << 'END'
+set test test
+expect {
+Everything looks like a nail to me! { pass "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+test -f hammer.log
+test -f hammer.sum
+
+$MAKE distcheck