From: Bruno Haible <bruno@clisp.org>
Date: Wed, 23 Sep 2009 08:28:57 +0000 (+0200)
Subject: Add 'link-warning' to testsrelated_modules during --import.
X-Git-Tag: v0.1~5432
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ddec812613d0f94065251dc5dd3105ac3b3889de;p=gnulib.git

Add 'link-warning' to testsrelated_modules during --import.
---

diff --git a/ChangeLog b/ChangeLog
index e3ef0e0a1..2d9b9ab8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-09-23  Bruno Haible  <bruno@clisp.org>
 
+	* gnulib-tool (func_import): Add 'link-warning' to testsrelated_modules
+	when needed.
+	Test case: gnulib-tool --import --with-tests atexit inttypes.
+	Reported by Pauli Miettinen <pauli.miettinen@cs.helsinki.fi>.
+
+2009-09-23  Bruno Haible  <bruno@clisp.org>
+
 	* gnulib-tool (func_emit_tests_Makefile_am): Set uses_subdirs in a
 	subcommand, not in a subshell.
 
diff --git a/gnulib-tool b/gnulib-tool
index 60d2578cf..ea018bd71 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2743,9 +2743,10 @@ func_import ()
   # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl
   # is specified, it will consist only of LGPLed source.
   # The tests-related module list is the transitive closure of the specified
-  # modules, including tests modules, minus the main module list. Its lib/*
-  # sources (brought in through dependencies of *-tests modules) go into
-  # $testsbase/. It may contain GPLed source, even if --lgpl is specified.
+  # modules, including tests modules, minus the main module list excluding
+  # 'link-warning'. Its lib/* sources (brought in through dependencies of
+  # *-tests modules) go into $testsbase/. It may contain GPLed source, even if
+  # --lgpl is specified.
   # Determine main module list.
   saved_inctests="$inctests"
   inctests=""
@@ -2759,7 +2760,8 @@ func_import ()
   fi
   # Determine tests-related module list.
   echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules
-  testsrelated_modules=`func_reset_sigpipe; echo "$main_modules" | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules`
+  sed_remove_link_warning='/^link-warning$/d'
+  testsrelated_modules=`func_reset_sigpipe; echo "$main_modules" | LC_ALL=C sort -u | sed -e "$sed_remove_link_warning" | LC_ALL=C join -v 2 - "$tmp"/final-modules`
   if test $verbose -ge 1; then
     echo "Tests-related module list:"
     echo "$testsrelated_modules" | sed -e 's/^/  /'