Mercurial > hg > octave-shane > gnulib-hg
changeset 13299:b50c33cca624
Fix regression from 2010-04-25.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 02 May 2010 14:49:23 +0200 |
| parents | 1a9111853b72 |
| children | 6aeb740648c5 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 51 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-02 Bruno Haible <bruno@clisp.org> + + Fix regression from 2010-04-25. + * gnulib-tool (func_modules_transitive_closure): Check the status of + all modules, not only of the tests that are of the form foo-tests where + foo is a module. + 2010-05-02 Bruno Haible <bruno@clisp.org> wctob: Work around nasty Cygwin 1.7.2 bug.
--- a/gnulib-tool +++ b/gnulib-tool @@ -2398,63 +2398,55 @@ if test -n "$duplicated_deps"; then func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` fi - for dep in $deps; do - if test -n "$incobsolete" \ - || { inc=true - for word in `func_get_status $dep`; do - case "$word" in - obsolete) - inc=false - ;; - esac - done - $inc - }; then - func_append inmodules " $dep" - fi - done if test -n "$inctests"; then testsmodule=`func_get_tests_module $module` if test -n "$testsmodule"; then - # Determine whether to include the tests module. - inc=true - for word in `func_get_status "$testsmodule"`; do - case "$word" in - c++-test) - test -z "$excl_cxx_tests" \ - || inc=false - test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \ - || inc=false - ;; - longrunning-test) - test -z "$excl_longrunning_tests" \ - || inc=false - test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \ - || inc=false - ;; - privileged-test) - test -z "$excl_privileged_tests" \ - || inc=false - test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \ - || inc=false - ;; - unportable-test) - test -z "$excl_unportable_tests" \ - || inc=false - test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \ - || inc=false - ;; - *-test) - test -n "$fmtc_inc_all_tests" \ - || inc=false - ;; - esac - done - if $inc; then - func_append inmodules " $testsmodule" - fi + deps="$deps $testsmodule" fi fi + for dep in $deps; do + # Determine whether to include the dependency or tests module. + inc=true + for word in `func_get_status $dep`; do + case "$word" in + obsolete) + test -n "$incobsolete" \ + || inc=false + ;; + c++-test) + test -z "$excl_cxx_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \ + || inc=false + ;; + longrunning-test) + test -z "$excl_longrunning_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \ + || inc=false + ;; + privileged-test) + test -z "$excl_privileged_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \ + || inc=false + ;; + unportable-test) + test -z "$excl_unportable_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \ + || inc=false + ;; + *-test) + test -n "$fmtc_inc_all_tests" \ + || inc=false + ;; + esac + done + if $inc; then + func_append inmodules " $dep" + fi + done fi fi done