[PATCH] build: run gnulib's tests, too

[Jim Meyering]

My 18-cset series has been side-tracked, as I've
explored differences between gnulib's regex code
and what's in glibc.

For now, here's something independent that I'm pushing:

>From 51ad8c98cbbc972d95046771f69421ff3ca5af40 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 5 Jan 2010 18:30:56 +0100
Subject: [PATCH] build: run gnulib's tests, too

* Makefile.am (SUBDIRS): Add gnulib-tests.
* gnulib-tests/Makefile.am: New file.
* bootstrap.conf (bootstrap_epilogue): New function, from coreutils.
(gnulib_tool_option_extras): Define.
* configure.ac: Add gnulib-tests/Makefile.
---
 Makefile.am              |    2 +-
 bootstrap.conf           |   10 ++++++++++
 configure.ac             |   17 ++++++++++-------
 gnulib-tests/Makefile.am |    1 +
 m4/.gitignore            |   12 ++++++++++++
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 gnulib-tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d076f82..b394afd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 AUTOMAKE_OPTIONS = gnu 1.10
 ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = po lib doc src tests vms
+SUBDIRS = po lib doc src tests vms gnulib-tests

 EXTRA_DIST = build-aux/config.rpath TODO README README-alpha \
             Makefile.boot README-boot
diff --git a/bootstrap.conf b/bootstrap.conf
index 3ddc4f0..ea11b47 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -118,3 +118,13 @@ fi

 # Automake requires that ChangeLog exist.
 test -f ChangeLog || touch ChangeLog || exit 1
+
+gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+
+bootstrap_epilogue()
+{
+  # Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
+  m=gnulib-tests/gnulib.mk
+  sed 's,\.\./\.\.,..,g' $m > $m-t
+  mv -f $m-t $m
+}
diff --git a/configure.ac b/configure.ac
index e553601..6cc8ebd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,11 +96,14 @@ if test x"$testpcre" = x"yes"; then
          [:])
 fi

-AC_CONFIG_FILES([Makefile
-                                lib/Makefile
-                                src/Makefile
-                                tests/Makefile
-                                po/Makefile.in
-                                doc/Makefile
-                                vms/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  lib/Makefile
+  src/Makefile
+  tests/Makefile
+  po/Makefile.in
+  doc/Makefile
+  vms/Makefile
+  gnulib-tests/Makefile
+])
 AC_OUTPUT
diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am
new file mode 100644
index 0000000..6635f70
--- /dev/null
+++ b/gnulib-tests/Makefile.am
@@ -0,0 +1 @@
+include gnulib.mk
diff --git a/m4/.gitignore b/m4/.gitignore
index 29016c9..68e3a3a 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,5 +1,6 @@
 00gnulib.m4
 alloca.m4
+argmatch.m4
 atexit.m4
 btowc.m4
 chdir-long.m4
@@ -16,6 +17,8 @@ dirname.m4
 dos.m4
 double-slash-root.m4
 dup2.m4
+eealloc.m4
+environ.m4
 errno_h.m4
 error.m4
 exclude.m4
@@ -49,6 +52,7 @@ intl.m4
 intldir.m4
 intlmacosx.m4
 intmax.m4
+inttostr.m4
 inttypes-pri.m4
 inttypes.m4
 inttypes_h.m4
@@ -61,12 +65,14 @@ lib-prefix.m4
 localcharset.m4
 locale-fr.m4
 locale-ja.m4
+locale-tr.m4
 locale-zh.m4
 locale_h.m4
 lock.m4
 longlong.m4
 lstat.m4
 malloc.m4
+malloca.m4
 mbchar.m4
 mbiter.m4
 mbrlen.m4
@@ -86,15 +92,19 @@ nls.m4
 onceonly.m4
 open.m4
 openat.m4
+pathmax.m4
 po.m4
 printf-posix.m4
 progtest.m4
+putenv.m4
+quote.m4
 quotearg.m4
 realloc.m4
 regex.m4
 rmdir.m4
 save-cwd.m4
 savedir.m4
+setenv.m4
 size_max.m4
 ssize_t.m4
 stat.m4
@@ -116,6 +126,7 @@ strtoll.m4
 strtoul.m4
 strtoull.m4
 strtoumax.m4
+symlink.m4
 sys_stat_h.m4
 threadlib.m4
 time_h.m4
@@ -126,6 +137,7 @@ visibility.m4
 wchar.m4
 wchar_t.m4
 wcrtomb.m4
+wctob.m4
 wctype.m4
 wcwidth.m4
 wint_t.m4
--
1.6.6.387.g2649b1