tests: use skip_ consistently.

* t/lisp-loadpath.sh: use skip_ instead of exit 77;
also, notice and reset if the EMACS envvar is simply "t".
* t/uninstall-fail.sh: use skip_ instead of the undefined skip.

diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 37bec19d6838d519c4054005807c06cae94be4a7..0e972d552698ec1193cada5ef2ee78f8614d26de 100644 (file)
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
@@ -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"
 fi
 
 cat >> configure.ac << 'END'

diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 4041e441b47fc7083db0703db28dcc28f05a84ec..59f8aa7d15cc8b35efdbe133b0acd09c0d036209 100644 (file)
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
@@ -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.,