topic/libposix -- patch to not test modules stripped of error module dependency

[Bruce Korb]

---
 libposix/bootstrap |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libposix/bootstrap b/libposix/bootstrap
index d965240..e5f6d60 100755
--- a/libposix/bootstrap
+++ b/libposix/bootstrap
@@ -41,22 +41,6 @@ cat > tmp/modules/libposix <<- _EOF_
        Gary V. Vaughan
        _EOF_

-# We cannot tell which modules will get pulled in via dependencies
-# when gnulib-tool gets run.  Therefore, strip out "error" from all
-# modules that mention it.  Either we won't use the module, or the
-# module will have to be tweaked to remove the dependency for libposix.
-# "GNULIB_LIBPOSIX" is a CPP symbol for libposix.
-#
-set -- `egrep -l '^error$' ../modules/[a-z]*`
-
-for mod
-do
-    test "X$mod" = Xerror && continue
-    echo 'NOTE: removing "error" dependency from' ${mod}
-    d=`basename $mod`
-    sed '/^error$/d' ${mod} > tmp/modules/$d
-done >&2
-
 opts='--local-dir=tmp
        --import
        --lib=libposix
@@ -69,8 +53,24 @@ opts='--local-dir=tmp
        --with-c++-tests
        --with-longrunning-tests'

+# We cannot tell which modules will get pulled in via dependencies
+# when gnulib-tool gets run.  Therefore, strip out "error" from all
+# modules that mention it.  Either we won't use the module, or the
+# module will have to be tweaked to remove the dependency for libposix.
+# "GNULIB_LIBPOSIX" is a CPP symbol for libposix.  Also, avoid testing
+# any module that has had its error dependency removed.
+#
+for mod in `egrep -l '^error$' ../modules/[a-z]*`
+do
+    test "X$mod" = Xerror && continue
+    d=`basename $mod`
+    opts="${opts} --avoid=${d}-tests"
+    sed '/^error$/d' ${mod} > tmp/modules/$d
+done >&2
+
 # Bootstrap for autotools.
 #
+echo gnulib-tool ${opts} git-version-gen libposix
 gnulib-tool ${opts} git-version-gen libposix

 # No need to maintain a Makefile.am just to include gnulib.mk.
-- 
1.7.1


---
 ChangeLog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b393086..e454ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-12-30  Bruce Korb  <address@hidden>

+       libposix/bootstrap: disable testing of error-module-using modules
+       * libposix/bootstrap (opts): append --avoid=${mod}-tests
+       for each module that has the error reference removed
+
+2010-12-30  Bruce Korb  <address@hidden>
+
        * libposix/bootstrap (posix_list): remove unnecessary temp file
        (modules): install all modules to tmp/modules that reference
        the 'error' module.
-- 
1.7.1


---
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e454ec9..6ab6c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2010-12-30  Bruce Korb  <address@hidden>
+2011-01-07  Bruce Korb  <address@hidden>

        libposix/bootstrap: disable testing of error-module-using modules
        * libposix/bootstrap (opts): append --avoid=${mod}-tests
-- 
1.7.1