From: Stefano Lattarini Date: Thu, 19 May 2011 20:07:48 +0000 (+0200) Subject: Merge branch 'master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~237 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920781c510b0219d44eb3201a9e6373f1c9b50a9;p=thirdparty%2Fautomake.git Merge branch 'master' into testsuite-work * master: test defs: rename requirement 'non-cross' -> 'native' --- 920781c510b0219d44eb3201a9e6373f1c9b50a9 diff --cc tests/defs index e4e3cc1a2,47d8c8992..e17df6c61 --- a/tests/defs +++ b/tests/defs @@@ -395,10 -382,11 +395,10 @@@ d ;; 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)