commit 82ef79c27829e60184340d9c57f870da450312a0 (HEAD, refs/remotes/origin/master)
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date:   Fri Nov 27 21:41:14 2015 +0000

    Exclude resource dirs from search for tests.
    
    * test/Makefile.in: Test file locations are now found with find
      rather than using finds native functions.

diff --git a/test/Makefile.in b/test/Makefile.in
index 545a0e1..d3a8eb9 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -99,10 +99,11 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
 	$(emacs) -l ert -l $$loadfile \
 	  -f ert-run-tests-batch-and-exit ${WRITE_LOG}
 
-ELFILES = $(filter-out ./manual%,\
-	$(sort $(wildcard ${srcdir}/*.el) $(wildcard ${srcdir}/*/*.el) \
-	$(wildcard ${srcdir}/*/*/*.el) $(wildcard ${srcdir}/*/*/*/*.el)))
+ELFILES = $(shell find ${srcdir} -path "./manual" -prune -o \
+		-path "*resources" -prune -o -name "*el" -print)
+ELCFILES = $(patsubst %.el,%.elc,${ELFILES})
 LOGFILES = $(patsubst %.el,%.log,${ELFILES})
+LOGSAVEFILES  = $(patsubst %.el,%.log~,${ELFILES})
 TESTS = $(subst ${srcdir}/,,$(LOGFILES:.log=))
 
 ## If we have to interrupt a hanging test, preserve the log so we can
@@ -138,12 +139,10 @@ check-maybe: ${LOGFILES}
 .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
 
 clean mostlyclean:
-	-rm -f ${srcdir}/*.log ${srcdir}/*.log~ ${srcdir}/*/*.log \
-		${srcdir}/*/*.log~ ${srcdir}/*/*/*.log \
-		${srcdir}/*/*/*.log~
+	-rm -f ${LOGFILES} ${LOGSAVEFILES}
 
 bootstrap-clean: clean
-	-rm -f ${srcdir}/*.elc ${srcdir}/*/*.elc ${srcdir}/*/*/*.elc
+	-rm -f ${ELCFILES}
 
 distclean: clean
 	rm -f Makefile

commit 6625890e7c2a259407819d6c287c882eabe23ba8
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date:   Fri Nov 27 11:56:18 2015 +0000

    Add test targets without directory names.
    
     * (test/Makefile.in): Extend test_template to add two targets for each
       file.

diff --git a/test/Makefile.in b/test/Makefile.in
index ee11a0b..545a0e1 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -112,10 +112,14 @@ TESTS = $(subst ${srcdir}/,,$(LOGFILES:.log=))
 .PHONY: ${TESTS}
 
 ## The short aliases that always re-run the tests, with no logging.
+## Define an alias both with and without the directory name for ease
+## of use.
 define test_template
 $(1):
 	@test ! -f ${srcdir}/$(1).log || mv ${srcdir}/$(1).log ${srcdir}/$(1).log~
 	@${MAKE} ${srcdir}/$(1).log WRITE_LOG=
+
+$(notdir $(1)): $(1)
 endef
 
 $(foreach test,${TESTS},$(eval $(call test_template,${test})))

commit 8eaba112c952eecd5b7f17af40c29584a7172f59
Author: Artur Malabarba <bruce.connor.am@gmail.com>
Date:   Fri Nov 27 10:59:52 2015 +0000

    * lisp/emacs-lisp/package.el: Require url-handlers

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 9029dbd..fdad84a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -167,6 +167,7 @@
 
 (require 'tabulated-list)
 (require 'macroexp)
+(require 'url-handlers)
 
 (defgroup package nil
   "Manager for Emacs Lisp packages."
@@ -1115,9 +1116,6 @@ The return result is a `package-desc'."
           (insert (format "Error while verifying signature %s:\n" sig-file)))
         (insert "\nCommand output:\n" (epg-context-error-output context))))))
 
-(declare-function url-insert-buffer-contents "url-handlers"
-                  (fn file &optional arglist fileonly))
-
 (defmacro package--with-work-buffer (location file &rest body)
   "Run BODY in a buffer containing the contents of FILE at LOCATION.
 LOCATION is the base location of a package archive, and should be

commit bd12d933d803ce547d59eba7b6f1900594c1426e
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date:   Fri Nov 27 10:27:36 2015 +0000

    Move elisp-mode-tests to new function names.
    
     * test/lisp/progmodes/elisp-mode-tests.el (find-defsdefun-c-defvar-c,
     find-defs-defun-el-defvar-c): Call `elisp--xref-find-definitions'.

diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index c910b59..97f86a9 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -543,7 +543,7 @@ to (xref-elisp-test-descr-to-target xref)."
 ;; FIXME: deftype
 
 (xref-elisp-deftest find-defs-defun-c-defvar-c
-  (elisp-xref-find 'definitions "system-name")
+  (elisp--xref-find-definitions 'system-name)
   (list
    (xref-make "(defvar system-name)"
 	      (xref-make-elisp-location 'system-name 'defvar "src/editfns.c"))
@@ -552,7 +552,7 @@ to (xref-elisp-test-descr-to-target xref)."
   )
 
 (xref-elisp-deftest find-defs-defun-el-defvar-c
-  (elisp-xref-find 'definitions "abbrev-mode")
+  (elisp--xref-find-definitions 'abbrev-mode)
   ;; It's a minor mode, but the variable is defined in buffer.c
   (list
    (xref-make "(defvar abbrev-mode)"