From: Stefano Lattarini Date: Thu, 2 Sep 2010 19:44:55 +0000 (+0200) Subject: Tests defs: make spacing more consistent. X-Git-Tag: ng-0.5a~351^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f2b76562c4358589c9527a622b905d024cad1d;p=thirdparty%2Fautomake.git Tests defs: make spacing more consistent. * tests/defs.in: Make spacing more consistent in indentation. Especially, indent using only spaces, not tabs. Also, move a comment to a better position. --- diff --git a/ChangeLog b/ChangeLog index be0a240f4..572a37e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-09-02 Stefano Lattarini + Tests defs: make spacing more consistent. + * tests/defs.in: Make spacing more consistent in indentation. + Especially, indent using only spaces, not tabs. Also, move + a comment to a better position. + Improve code for requiring libtool and gettext in tests. * tests/defs.in: Stricter (and more correct) detection of wheter libtool, libtoolize and/or gettext are in $required. diff --git a/tests/defs.in b/tests/defs.in index 8544dbcde..fe2dbafec 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -202,11 +202,11 @@ do rst2html) # Try the variants that are tried in check.am. while :; do - for r2h in $RST2HTML rst2html rst2html.py; do - echo "$me: running $r2h --version" - $r2h --version && break 2 - done - exit 77 + for r2h in $RST2HTML rst2html rst2html.py; do + echo "$me: running $r2h --version" + $r2h --version && break 2 + done + exit 77 done ;; runtest) @@ -226,8 +226,8 @@ do echo "$me: running texi2dvi -o /dev/null --version" ( texi2dvi -o /dev/null --version ) || exit 77 ;; - # Generic case: the tool must support --version. *) + # Generic case: the tool must support --version. echo "$me: running $tool --version" ( $tool --version ) || exit 77 ;; @@ -357,23 +357,23 @@ case " $required " in libtool_found=no gettext_found=no for d in $extra_includes $aclocaldir ; do - test "x$d" != x-I || continue - if test -f "$d/libtool.m4"; then - libtool_found=yes - fi - if test -f "$d/gettext.m4"; then - gettext_found=yes - fi + test "x$d" != x-I || continue + if test -f "$d/libtool.m4"; then + libtool_found=yes + fi + if test -f "$d/gettext.m4"; then + gettext_found=yes + fi done case " $required " in - *' libtool '* | *' libtoolize '* ) test $libtool_found = yes || Exit 77 ;; - *' gettext '* ) test $gettext_found = yes || Exit 77 ;; + *' libtool '* | *' libtoolize '* ) test $libtool_found = yes || Exit 77;; + *' gettext '* ) test $gettext_found = yes || Exit 77;; esac # Libtool cannot cope with spaces in the build tree. Our testsuite setup # cannot cope with spaces in the source tree name for Libtool and gettext # tests. case $srcdir,`pwd` in - *\ * | *\ *) Exit 77 ;; + *\ * | *\ *) Exit 77;; esac ACLOCAL="$ACLOCAL -Wno-syntax -I $srcdir/../m4 $extra_includes -I $aclocaldir" ;;