]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 19 May 2011 19:53:02 +0000 (21:53 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 19 May 2011 19:53:02 +0000 (21:53 +0200)
* maint:
  test defs: rename requirement 'non-cross' -> 'native'

1  2 
ChangeLog
tests/defs

diff --cc ChangeLog
Simple merge
diff --cc tests/defs
index 3be8eade138374112448e4a90c8058bb55beb90b,e020498af9d11f1fe3908043d063a32116c5e423..47d8c8992c8404c179a66b129660db58ea83556f
        (echo foo >> $priv_check_temp) >/dev/null 2>&1
        overwrite_status=$?
        rm -f $priv_check_temp
 -      test $overwrite_status = 0 && exit 77
 +      if test $overwrite_status -eq 0; then
 +        echo "$me: cannot drop file write permissions" >&2
 +        exit 77
 +      fi
 +      unset priv_check_temp overwrite_status
 +      ;;
 +    perl-threads)
 +      if test "$WANT_NO_THREADS" = "yes"; then
 +        echo "$me: skip with Devel::Cover: cannot cope with threads" >&2
 +        exit 77
 +      fi
        ;;
-     non-cross)
+     native)
        cross_compiling && skip_ "doesn't work in cross-compile mode"
        ;;
      python)