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.

diff --git a/configure.ac b/configure.ac
index f3172ad985d17891a2906085a5f73563c515d526..71f29e9d15a11d8b9676e5a72de42e7e14a0360a 100644 (file)
--- 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 1693c3b393bd213aced8680ac37a049c45463a72..6635f70657af049dd1684cf480af90f3ca55f72f 100644 (file)
--- 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 54b07ba5f36d3a7aa4eff30b7a263c41579a76b3..2e2a5f06f4a0b9017508c06599c7437a7221a999 100644 (file)
--- 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