martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* test/automated/Makefile.in (abs_srcdir): Remove.

Browse Source 
(emacs): Unset EMACSLOADPATH.
(.el.elc, check): Use -L to append srcdir to load-path.
This commit is contained in:
Glenn Morris
2013-11-03 17:48:08 -08:00
parent 6dc6d30179
commit 8b77446f3f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/ChangeLog
View File

@@ -1,3 +1,9 @@
2013-11-04 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (abs_srcdir): Remove.
(emacs): Unset EMACSLOADPATH.
(.el.elc, check): Use -L to append srcdir to load-path.
2013-11-02 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)

8
test/automated/Makefile.in
View File

@@ -20,7 +20,6 @@
SHELL = @SHELL@
srcdir = @srcdir@
abs_srcdir = @abs_srcdir@
VPATH = $(srcdir)
# We never change directory before running Emacs, so a relative file
@@ -35,7 +34,8 @@ EMACSOPT = -batch --no-site-file --no-site-lisp
BYTE_COMPILE_EXTRA_FLAGS =
# The actual Emacs command run in the targets below.
emacs = EMACSLOADPATH="$(abs_srcdir)/../../lisp:$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
# Prevent any setting of EMACSLOADPATH in user environment causing problems.
emacs = unset EMACSLOADPATH; LC_ALL=C "$(EMACS)" $(EMACSOPT)
# Common command to find subdirectories
setwins=subdirs=`find . -type d -print`; \
@@ -55,7 +55,7 @@ all: check
.el.elc:
@echo Compiling $<
@$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
@$(emacs) -L :$(srcdir) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
.PHONY: compile-targets compile-main compile-clean
@@ -110,6 +110,6 @@ check: compile-main
done; \
echo Testing $$els; \
cd "$$thisdir"; \
$(emacs) --chdir $(srcdir) $$args -f ert-run-tests-batch-and-exit
$(emacs) --chdir $(srcdir) -L :. $$args -f ert-run-tests-batch-and-exit
# Makefile ends here.