aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2005-12-24 01:00:58 +0000
committerBen Elliston <bje@gnu.org>2005-12-24 01:00:58 +0000
commita7be869b17a86f116ae5e2500e23115b236060b7 (patch)
tree74d942eb6f5dab91680afa1b6ffd25c557d60a42
parentf52c0f22136b2ad34c5a83e72cdcdd76337e3567 (diff)
downloaddejagnu-a7be869b17a86f116ae5e2500e23115b236060b7.zip
dejagnu-a7be869b17a86f116ae5e2500e23115b236060b7.tar.gz
dejagnu-a7be869b17a86f116ae5e2500e23115b236060b7.tar.bz2
* Makefile.am (RUNTEST): Simplify, as Automake already generates
similar logic in Makefile.in. * Makefile.in: Regenerate.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am6
-rw-r--r--Makefile.in5
3 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bdbc26..3b08e8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-12-24 Ben Elliston <bje@gnu.org>
+ * Makefile.am (RUNTEST): Simplify, as Automake already generates
+ similar logic in Makefile.in.
+ * Makefile.in: Regenerate.
+
+2005-12-24 Ben Elliston <bje@gnu.org>
+
* Makefile.am (RUNTESTDEFAULTFLAGS): Omit --tool so that
libdejagnu tests are run too.
* Makefile.in: Regenerate.
diff --git a/Makefile.am b/Makefile.am
index 5f24161..0d36c64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,11 +189,9 @@ TESTSUITE_FILES = \
testsuite/lib/util-defs.exp \
testsuite/libdejagnu/tunit.exp
-RUNTEST = `if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
- echo ${top_srcdir}/runtest$(EXEEXT); \
- else echo "ERROR: runtest not found" ; exit 1; fi`
-
+RUNTEST = ${top_srcdir}/runtest
RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite
+
AM_CXXFLAGS = -I$(top_srcdir) -g
check_PROGRAMS = unit
unit_SOURCES = testsuite/libdejagnu/unit.cc
diff --git a/Makefile.in b/Makefile.in
index 4aceb1c..811b217 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,10 +388,7 @@ TESTSUITE_FILES = \
testsuite/lib/util-defs.exp \
testsuite/libdejagnu/tunit.exp
-RUNTEST = `if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
- echo ${top_srcdir}/runtest$(EXEEXT); \
- else echo "ERROR: runtest not found" ; exit 1; fi`
-
+RUNTEST = ${top_srcdir}/runtest$(EXEEXT)
RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite
AM_CXXFLAGS = -I$(top_srcdir) -g
unit_SOURCES = testsuite/libdejagnu/unit.cc