Changeset 2438

Timestamp:

Mar 13, 2011, 12:45:59 AM (12 years ago)

Author:

Peter

Message:

Move yathello test from maintainer-check to installcheck, which means
it is run also during distcheck. The check is split into two parts: 1)
Generate a tarball and as this step requires autotools it is typically
only done by the maintainer (or developers) and included in the
distribution. 2) At intallcheck time the tarball is extracted and the
yat-hello package is built using the installed yat. The name of this
toy package has changed from yathello to yat-hello to avoid file name
conflicts.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/yat-hello (added)
• test/yat-hello/Makefile.am (added)
• test/yat-hello/configure.ac (added)
• test/yat-hello/hello.cc (added)

trunk/configure.ac

@@ -268 +268 @@
 
 
-AC_CONFIG_FILES([test/create_yathello.sh], [chmod +x test/create_yathello.sh])
 AC_CONFIG_FILES([build_support/gen_yat_pc.sh], 
                 [chmod +x build_support/gen_yat_pc.sh])

trunk/test/Makefile.am

@@ -40 +40 @@
 
 FORCE:
-
-yathello: create_yathello.sh $(top_srcdir)/m4/yat.m4
-  ./create_yathello.sh
-
-# testing autoconf macro YAT_CHECK_YAT on an installed yat (the bindir
-# argument requires some care).
-yat_check_yat_test: yathello FORCE
-  cd yathello && autoreconf -sivf && \
-  ./configure --with-yat=$(bindir) && $(MAKE) check
 
 EXTRA_PROGRAMS = alignment.test averager.test \
@@ -127 +118 @@
 ## care of whether doxygen will run or not.
 documentation_test.log: FORCE
+
+
+# yat-hello is an example of a tiny package that uses yat
+noinst_DATA = $(srcdir)/yat-hello-1.0.tar.gz
+
+# Directory yat-hello contains what a developer would check out
+# from a VCS, i.e., no files generated by autotools.
+yat_hello_sources  =
+yat_hello_sources += yat-hello/configure.ac
+yat_hello_sources += yat-hello/Makefile.am
+yat_hello_sources += yat-hello/hello.cc
+
+EXTRA_DIST += $(yat_hello_sources)
+
+yat_hello_tmp_files =
+yat_hello_tmp_files += Makefile.in
+yat_hello_tmp_files += autom4te.cache
+yat_hello_tmp_files += aclocal.m4
+yat_hello_tmp_files += config.guess
+yat_hello_tmp_files += config.sub
+yat_hello_tmp_files += configure
+yat_hello_tmp_files += depcomp
+yat_hello_tmp_files += install-sh
+yat_hello_tmp_files += ltmain.sh
+yat_hello_tmp_files += m4
+yat_hello_tmp_files += missing
+
+
+
+yat_hello_deps = $(yat_hello_sources) 
+yat_hello_deps += $(top_srcdir)/m4/yat.m4 
+## We depend on version.m4 so tarball is updated at every release (at least)
+yat_hello_deps += $(top_srcdir)/m4/version.m4
+
+$(srcdir)/yat-hello-1.0.tar.gz: $(yat_hello_deps) 
+  cd $(srcdir)/yat-hello \
+  && $(MKDIR_P) m4 \
+  && $(ACLOCAL) -I m4 --install -I $(abs_top_srcdir)/m4 \
+  && autoreconf -ivf \
+  && ./configure --without-yat \
+  && $(MAKE) $(AM_MAKEFLAGS) dist \
+  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+  && mv yat-hello-1.0.tar.gz .. \
+  && rm -rf $(yat_hello_tmp_files) 
+
+installcheck-local: yat-hello-check
+
+yat-hello-check: $(srcdir)/yat-hello-1.0.tar.gz
+  GZIP=$(GZIP_ENV) gzip -dc $< | $(am__untar) \
+  && cd yat-hello-1.0 \
+  && ./configure --with-yat=$(bindir) \
+  && $(MAKE) $(AM_MAKEFLAGS) all \
+  && ./hello \
+  && cd .. \
+  && rm -rf yat-hello-1.0