[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114919: test/automated: Use relative filename for e
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114919: test/automated: Use relative filename for emacs executable |
Date: |
Sat, 02 Nov 2013 20:54:19 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114919
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 13:54:08 -0700
message:
test/automated: Use relative filename for emacs executable
* Makefile.in (check): Depend on all.
* test/automated/Makefile.in (abs_top_builddir): Remove variable.
(EMACS): Use a relative file name.
(lisp-compile): Remove (assume it's up-to-date).
(compile-main): Do not run lisp-compile.
(check): Use --chdir.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/Makefile.in makefile.in-20110112160650-056hnl9qhpjvjicy-6
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-31 21:39:10 +0000
+++ b/ChangeLog 2013-11-02 20:54:08 +0000
@@ -1,3 +1,7 @@
+2013-11-02 Glenn Morris <address@hidden>
+
+ * Makefile.in (check): Depend on all.
+
2013-10-31 Glenn Morris <address@hidden>
* configure.ac: Use [!...] rather than [^...], for ksh. (Bug#15769)
=== modified file 'Makefile.in'
--- a/Makefile.in 2013-10-30 06:40:15 +0000
+++ b/Makefile.in 2013-11-02 20:54:08 +0000
@@ -936,7 +936,7 @@
TAGS tags: lib lib-src src
cd src; $(MAKE) $(MFLAGS) tags
-check:
+check: all
@if test ! -d test/automated; then \
echo "You do not seem to have the test/ directory."; \
echo "Maybe you are using a release tarfile, rather than a repository
checkout."; \
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2013-11-02 20:32:22 +0000
+++ b/test/ChangeLog 2013-11-02 20:54:08 +0000
@@ -1,12 +1,15 @@
2013-11-02 Glenn Morris <address@hidden>
* automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)
- (test, abs_top_srcdir): Remove variables.
+ (test, abs_top_srcdir, abs_top_builddir): Remove variables.
(abs_srcdir): New, set by configure.
+ (EMACS): Use a relative file name.
(emacs): Use abs_srcdir rather than abs_lispsrc, abs_test.
- (lisp-compile): Use ../../lisp rather than $lisp.
+ (lisp-compile): Remove (assume it's up-to-date).
+ (compile-main): Do not run lisp-compile.
(compile-main, compile-clean, compile-always, bootstrap-clean)
(check): Use srcdir rather than $test. Check cd return value.
+ Use --chdir.
(doit, compile, compile-always): Remove stuff copied from lisp/.
(all, check, bootstrap-clean, distclean, maintainer-clean): PHONY.
=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in 2013-11-02 20:32:22 +0000
+++ b/test/automated/Makefile.in 2013-11-02 20:54:08 +0000
@@ -21,16 +21,12 @@
srcdir = @srcdir@
abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
VPATH = $(srcdir)
-# You can specify a different executable on the make command line,
-# e.g. "make EMACS=../src/emacs ...".
-
-# We sometimes change directory before running Emacs (typically when
-# building out-of-tree, we chdir to the source directory), so we need
-# to use an absolute file name.
-EMACS = ${abs_top_builddir}/src/emacs
+# We never change directory before running Emacs, so a relative file
+# name is fine, and makes life easier. If we need to change
+# directory, we can use emacs --chdir.
+EMACS = ../../src/emacs
# Command line flags for Emacs.
EMACSOPT = -batch --no-site-file --no-site-lisp
@@ -62,17 +58,14 @@
@$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
-.PHONY: lisp-compile compile-targets compile-main compile-clean
-
-lisp-compile:
- cd ../../lisp && $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
+.PHONY: compile-targets compile-main compile-clean
# TARGETS is set dynamically in the recursive call from `compile-main'.
compile-targets: $(TARGETS)
# Compile all the Elisp files that need it. Beware: it approximates
# `no-byte-compile', so watch out for false-positives!
-compile-main: compile-clean lisp-compile
+compile-main: compile-clean
@(cd $(srcdir) && $(setwins); \
els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el
|g'`; \
for el in $$els; do \
@@ -108,7 +101,7 @@
check: compile-main
- @(cd $(srcdir) && $(setwins); \
+ @thisdir=`pwd`; cd $(srcdir) && $(setwins); \
pattern=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's|
|/*.el |g'`; \
for el in $$pattern; do \
test -f $$el || continue; \
@@ -116,6 +109,7 @@
els="$$els $$el"; \
done; \
echo Testing $$els; \
- $(emacs) $$args -f ert-run-tests-batch-and-exit)
+ cd "$$thisdir"; \
+ $(emacs) --chdir $(srcdir) $$args -f ert-run-tests-batch-and-exit
# Makefile ends here.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114919: test/automated: Use relative filename for emacs executable,
Glenn Morris <=