From f42ee040afd2e142951a9809b1d14550c29330e8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Feb 2017 15:15:11 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ gnulib-tool | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 17a2dd6e07..1adb3f4a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-02-19 Bruno Haible + + 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 users.txt: Update links, use HTTPS where possible diff --git a/gnulib-tool b/gnulib-tool index 5b6620e9c3..8b3f61fc00 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -5850,6 +5850,12 @@ func_create_testdir () # 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 -- 2.39.5