changeset 18704:316d6897d46c

gnulib-tool: Avoid conflict of havelib-tests with --single-configure. * gnulib_tool (func_create_testdir): Avoid havelib-tests when --with-tests --single-configure is specified.
author Bruno Haible <bruno@clisp.org>
date Sun, 19 Feb 2017 15:15:11 +0100
parents 73d8b6b71877
children a54a3e501f5b
files ChangeLog gnulib-tool
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 16 11:12:57 2017 +0100
+++ b/ChangeLog	Sun Feb 19 15:15:11 2017 +0100
@@ -1,3 +1,9 @@
+2017-02-19  Bruno Haible  <bruno@clisp.org>
+
+	gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
+	* gnulib_tool (func_create_testdir): Avoid havelib-tests when
+	--with-tests --single-configure is specified.
+
 2017-02-16  Tim Rühsen  <tim.ruehsen@gmx.de>
 
 	users.txt: Update links, use HTTPS where possible
--- a/gnulib-tool	Thu Feb 16 11:12:57 2017 +0100
+++ b/gnulib-tool	Sun Feb 19 15:15:11 2017 +0100
@@ -5850,6 +5850,12 @@
   # Canonicalize the list of specified modules.
   specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u`
 
+  # Test modules which invoke AC_CONFIG_FILES cannot be used with
+  # --with-tests --single-configure. Avoid them.
+  if $inctests && $single_configure; then
+    avoidlist="$avoidlist havelib-tests"
+  fi
+
   # Unlike in func_import, here we want to include all kinds of tests for the
   # directly specified modules, but not for dependencies.
   inc_all_direct_tests=true