summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-03-30 09:47:07 +0200
committerJim Meyering <meyering@redhat.com>2009-03-31 20:29:01 +0200
commit30071248c9e1132b4d5d9559f97b6199cc91556e (patch)
tree7e4a91278482fea17d0485070f1207e3c54a6a2b
parentf8268d3baecee552e13efb916693bfa51734862b (diff)
downloadcoreutils-30071248c9e1132b4d5d9559f97b6199cc91556e.tar.xz
tests: enable automake's color-tests and parallel-tests via configure.ac
* gnulib-tests/Makefile.am (AUTOMAKE_OPTIONS): Don't define here. * tests/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * configure.ac (AM_INIT_AUTOMAKE): Instead, add color-tests and parallel-tests here.
-rw-r--r--configure.ac2
-rw-r--r--gnulib-tests/Makefile.am2
-rw-r--r--tests/Makefile.am1
3 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f3172ad98..71f29e9d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_CONFIG_SRCDIR([src/ls.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
-AM_INIT_AUTOMAKE([1.10a dist-xz])
+AM_INIT_AUTOMAKE([1.10a dist-xz color-tests parallel-tests])
AC_PROG_CC_STDC
AM_PROG_CC_C_O
diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am
index 1693c3b39..6635f7065 100644
--- a/gnulib-tests/Makefile.am
+++ b/gnulib-tests/Makefile.am
@@ -1,3 +1 @@
include gnulib.mk
-
-AUTOMAKE_OPTIONS += parallel-tests color-tests
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 54b07ba5f..2e2a5f06f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -587,5 +587,4 @@ pr_data = \
pr/ttb3-FF \
pr/w72l24f-ll
-AUTOMAKE_OPTIONS = parallel-tests color-tests
include $(srcdir)/check.mk