diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2015-11-23 22:08:52 +0000 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2015-11-24 17:10:12 +0000 |
| commit | 94bb3d7a808b8ed29336250bf5ffaf636280ee1e (patch) | |
| tree | bc1e629e3f7c381ecc424d2aeb846be8d18c6a73 /test | |
| parent | 22bbf7ca22f11cc33d887d0162cf2ec6661c3a3e (diff) | |
| download | emacs-94bb3d7a808b8ed29336250bf5ffaf636280ee1e.tar.gz emacs-94bb3d7a808b8ed29336250bf5ffaf636280ee1e.tar.bz2 emacs-94bb3d7a808b8ed29336250bf5ffaf636280ee1e.zip | |
Test infrastructure: updates after directory move
* (test/Makefile.in): Support directories several levels deep.
* (test/data/flymake): Rename to test/lisp/progmodes/flymake-resources.
* (test/lisp/progmodes/flymake-tests.el): Support renamed resource directory.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 19 | ||||
| -rw-r--r-- | test/lisp/progmodes/flymake-resources/test.c (renamed from test/data/flymake/test.c) | 0 | ||||
| -rw-r--r-- | test/lisp/progmodes/flymake-resources/test.pl (renamed from test/data/flymake/test.pl) | 0 | ||||
| -rw-r--r-- | test/lisp/progmodes/flymake-tests.el | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 41f54f8aa69..3343f729bf6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -37,7 +37,7 @@ SEPCHAR = @SEPCHAR@ # 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 +EMACS = ../src/emacs EMACS_EXTRAOPT= @@ -99,9 +99,10 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ $(emacs) -l ert -l $$loadfile \ -f ert-run-tests-batch-and-exit ${WRITE_LOG} -ELFILES = $(sort $(wildcard ${srcdir}/*.el)) -LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES})) -TESTS = ${LOGFILES:.log=} +ELFILES = $(sort $(wildcard ${srcdir}/*.el) $(wildcard ${srcdir}/*/*.el) \ + $(wildcard ${srcdir}/*/*/*.el) $(wildcard ${srcdir}/*/*/*/*.el)) +LOGFILES = $(patsubst %.el,%.log,${ELFILES}) +TESTS = $(subst ${srcdir}/,,$(LOGFILES:.log=)) ## If we have to interrupt a hanging test, preserve the log so we can ## see what the problem was. @@ -112,8 +113,8 @@ TESTS = ${LOGFILES:.log=} ## The short aliases that always re-run the tests, with no logging. define test_template $(1): - @test ! -f $(1).log || mv $(1).log $(1).log~ - @${MAKE} $(1).log WRITE_LOG= + @test ! -f ${srcdir}/$(1).log || mv ${srcdir}/$(1).log ${srcdir}/$(1).log~ + @${MAKE} ${srcdir}/$(1).log WRITE_LOG= endef $(foreach test,${TESTS},$(eval $(call test_template,${test}))) @@ -132,10 +133,12 @@ check-maybe: ${LOGFILES} .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean clean mostlyclean: - -rm -f *.log *.log~ + -rm -f ${srcdir}/*.log ${srcdir}/*.log~ ${srcdir}/*/*.log \ + ${srcdir}/*/*.log~ ${srcdir}/*/*/*.log \ + ${srcdir}/*/*/*.log~ bootstrap-clean: clean - -rm -f ${srcdir}/*.elc + -rm -f ${srcdir}/*.elc ${srcdir}/*/*.elc ${srcdir}/*/*/*.elc distclean: clean rm -f Makefile diff --git a/test/data/flymake/test.c b/test/lisp/progmodes/flymake-resources/test.c index 3a3926131f5..3a3926131f5 100644 --- a/test/data/flymake/test.c +++ b/test/lisp/progmodes/flymake-resources/test.c diff --git a/test/data/flymake/test.pl b/test/lisp/progmodes/flymake-resources/test.pl index d5abcb47e7f..d5abcb47e7f 100644 --- a/test/data/flymake/test.pl +++ b/test/lisp/progmodes/flymake-resources/test.pl diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el index 11231bc3f7a..1d8c12c0655 100644 --- a/test/lisp/progmodes/flymake-tests.el +++ b/test/lisp/progmodes/flymake-tests.el @@ -26,7 +26,7 @@ (require 'flymake) (defvar flymake-tests-data-directory - (expand-file-name "data/flymake" (getenv "EMACS_TEST_DIRECTORY")) + (expand-file-name "lisp/progmodes/flymake-resources" (getenv "EMACS_TEST_DIRECTORY")) "Directory containing flymake test data.") |