diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | Makefile.in | 22 | ||||
| -rw-r--r-- | example/Makefile.am | 3 | ||||
| -rw-r--r-- | example/Makefile.in | 3 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 7 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 6 |
7 files changed, 54 insertions, 19 deletions
@@ -1,3 +1,12 @@ +2001-04-06 Rob Savoye <rob@slipknot.welcomehome.org> + + * Makefile.am: Add an empty check-DEJAGNU target, cause we only + want to run the testsuite once. + * example/Makefile.am: Don't run "calc" as part of check target, + cause calc is just an example. + * testsuite/Makefile.am: Use the runtest in the source tree, or + refuse to run. + 2001-04-03 David Billinghurst <David.Billinghurst@riotinto.com> * baseboards/unix.exp: Don't link with -lm on cygwin. diff --git a/Makefile.am b/Makefile.am index 4b93a73..fd05622 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,11 @@ RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir)/testsuite RUNTEST=$(RUNT RUNTEST = ` \ if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then \ echo ${srcdir}/runtest$(EXEEXT) ; \ - else echo runtest ; fi` + else echo "ERROR: runtest not found" ; exit 1; fi` + +CLEANFILES = x.log x.sum site.bak setval.tmp +check-DEJAGNU: + @echo "Do nothing here, cause we don't want to run the tests twice" # Set ourselves up to build a RedHat package dist2: rpmspec overview.html @@ -32,9 +36,9 @@ dist2: rpmspec overview.html (cd dejagnu-${VERSION}.0 ; $(srcdir)/Clean.tcl) -mkdir -p doc/overview -cp -fr doc/overview dejagnu-${VERSION}.0/doc/ - tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}.0 - gzip -9fv ../dejagnu-${VERSION}.tar - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/ + tar cvf ../dejagnu-${VERSION}.0.tar dejagnu-${VERSION}.0 + gzip -9fv ../dejagnu-${VERSION}.0.tar + cp -f ../dejagnu-${VERSION}.0.tar.gz /usr/src/redhat/SOURCES/ cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/ rpmspec: @@ -97,3 +101,14 @@ uninstall-local: test ! -f "$$f" || rm -f $(baseboards_dest)/`basename "$$f"`; \ done + + + + + + + + + + + diff --git a/Makefile.in b/Makefile.in index bb345f8..9df84c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -87,9 +87,11 @@ libexec_SCRIPTS = config.guess TLCSH = @TCLSH@ RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST) -RUNTEST = ` if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then echo ${srcdir}/runtest$(EXEEXT) ; else echo runtest ; fi` +RUNTEST = ` if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then echo ${srcdir}/runtest$(EXEEXT) ; else echo "ERROR: runtest not found" ; exit 1; fi` +CLEANFILES = x.log x.sum site.bak setval.tmp + # Below, host-independent data files that need to get installed. # We do it this way so we can use globbing. @@ -347,15 +349,6 @@ distdir: $(DISTFILES) RUNTESTFLAGS = DEJATOOL = $(PACKAGE) - -check-DEJAGNU: site.exp - srcdir=`cd $(srcdir) && pwd`; export srcdir; \ - EXPECT=$(EXPECT); export EXPECT; \ - runtest=$(RUNTEST); \ - if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ - else echo "WARNING: could not find \`runtest'" 1>&2; :;\ - fi site.exp: Makefile @echo 'Making a new site.exp file...' @test ! -f site.bak || rm -f site.bak @@ -403,6 +396,7 @@ installdirs-am: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -445,6 +439,8 @@ all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +check-DEJAGNU: + @echo "Do nothing here, cause we don't want to run the tests twice" # Set ourselves up to build a RedHat package dist2: rpmspec overview.html @@ -454,9 +450,9 @@ dist2: rpmspec overview.html (cd dejagnu-${VERSION}.0 ; $(srcdir)/Clean.tcl) -mkdir -p doc/overview -cp -fr doc/overview dejagnu-${VERSION}.0/doc/ - tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}.0 - gzip -9fv ../dejagnu-${VERSION}.tar - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/ + tar cvf ../dejagnu-${VERSION}.0.tar dejagnu-${VERSION}.0 + gzip -9fv ../dejagnu-${VERSION}.0.tar + cp -f ../dejagnu-${VERSION}.0.tar.gz /usr/src/redhat/SOURCES/ cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/ rpmspec: diff --git a/example/Makefile.am b/example/Makefile.am index 9408769..15e59ee 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -3,3 +3,6 @@ AUTOMAKE_OPTIONS = dejagnu SUBDIRS = calc + +check-recursive: + @echo "No check target in examples"
\ No newline at end of file diff --git a/example/Makefile.in b/example/Makefile.in index 7b5faf6..3ced4ef 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -310,6 +310,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +check-recursive: + @echo "No check target in examples" + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 13fe9da..c705f37 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -5,5 +5,10 @@ AUTOMAKE_OPTIONS = dejagnu all: @echo "Nothing to be done for all" -RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $$srcdir +RUNTEST = ` \ + if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \ + echo ${top_srcdir}/runtest$(EXEEXT) ; \ + else echo "ERROR: runtest not found" ; exit 1; fi` +RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $$srcdir +CLEANFILES = *.log *.sum site.bak setval.tmp diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 5ab2a58..21f9c9a 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -71,7 +71,11 @@ tclsh = @tclsh@ AUTOMAKE_OPTIONS = dejagnu +RUNTEST = ` if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then echo ${top_srcdir}/runtest$(EXEEXT) ; else echo "ERROR: runtest not found" ; exit 1; fi` + + RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $$srcdir +CLEANFILES = *.log *.sum site.bak setval.tmp mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in @@ -82,7 +86,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best EXPECT = expect -RUNTEST = runtest all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -172,6 +175,7 @@ installdirs: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) |