From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 19 May 2011 19:53:02 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab513a9f2bf257fa66a1f6f09f6b6768a216c45e;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  test defs: rename requirement 'non-cross' -> 'native'
---

ab513a9f2bf257fa66a1f6f09f6b6768a216c45e
diff --cc tests/defs
index 3be8eade1,e020498af..47d8c8992
--- a/tests/defs
+++ b/tests/defs
@@@ -374,19 -290,9 +374,19 @@@ d
        (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)