]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into testsuite-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 19 May 2011 20:07:48 +0000 (22:07 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 19 May 2011 20:07:48 +0000 (22:07 +0200)
* master:
  test defs: rename requirement 'non-cross' -> 'native'

1  2 
ChangeLog
tests/defs

diff --cc ChangeLog
Simple merge
diff --cc tests/defs
index e4e3cc1a24a717300a6532b315dbb56a4c3c3e22,47d8c8992c8404c179a66b129660db58ea83556f..e17df6c611d4dd2efd298e1d285d05df5a397003
        ;;
      perl-threads)
        if test "$WANT_NO_THREADS" = "yes"; then
 -        echo "$me: skip with Devel::Cover: cannot cope with threads" >&2
 -        exit 77
 +        skip_ "Devel::Cover cannot cope with threads"
        fi
        ;;
-     non-cross)
+     native)
        cross_compiling && skip_ "doesn't work in cross-compile mode"
        ;;
      python)