[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[automake-commit] branch master updated: tests: use skip_ consistently.

From: Karl Berry
Subject: [automake-commit] branch master updated: tests: use skip_ consistently.
Date: Wed, 08 Jan 2020 21:21:52 -0500

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

The following commit(s) were added to refs/heads/master by this push:
     new 01db7b0  tests: use skip_ consistently.
01db7b0 is described below

commit 01db7b0de54acf80cf4b4a55d3e9a9dab454b0aa
Author: Karl Berry <address@hidden>
AuthorDate: Wed Jan 8 18:21:26 2020 -0800

    tests: use skip_ consistently.
    * t/ use skip_ instead of exit 77;
    also, notice and reset if the EMACS envvar is simply "t".
    * t/ use skip_ instead of the undefined skip.
 t/  | 6 +++++-
 t/ | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/t/ b/t/
index 37bec19..0e972d5 100644
--- a/t/
+++ b/t/
@@ -32,9 +32,13 @@ required=emacs
 # Situation with Emacs 22 and 23 is unknown, so play it safe and skip
 # the test for them too.
+# Meanwhile, Emacs sets the EMACS envvar to t in subshells.
+# If that's what we've got, use "emacs" instead.
+test "$EMACS" = t && EMACS=emacs || :
 emacs_major=$(${EMACS-emacs} --version | sed -e 's/.* //;s/\..*$//;1q')
 if test -z "$emacs_major" || test "$emacs_major" -le 23; then
-  exit 77
+  skip_ "emacs version $emacs_major may reverse -L ordering"
 cat >> << 'END'
diff --git a/t/ b/t/
index 4041e44..59f8aa7 100644
--- a/t/
+++ b/t/
@@ -24,7 +24,7 @@
 mkdir d
 : > d/f
-chmod a-w d || skip "cannot make directories unwritable"
+chmod a-w d || skip_ "cannot make directories unwritable"
 # On Solaris 10, if '/bin/rm' is run with the '-f' option, it doesn't
 # print any error message when failing to remove a file (due to e.g.,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]