aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-02-16 11:23:58 +0100
committerMichael Albinus2016-02-16 11:23:58 +0100
commitc850fe6e0bcff5d33100b687ecf25a91f79f17b0 (patch)
treed4862607b4970aef93573921a3a16e4aed8a4ca0
parentd5e827929c5f25ccfe68a420bfc45305b06ae5cf (diff)
downloademacs-c850fe6e0bcff5d33100b687ecf25a91f79f17b0.tar.gz
emacs-c850fe6e0bcff5d33100b687ecf25a91f79f17b0.zip
Minor cleanup in CONTRIBUTE and test/README
* CONTRIBUTE: Remove detailed explanation about testing; this is now in test/README. * test/README: Don't mention automated/ subdirectory.
-rw-r--r--CONTRIBUTE25
-rw-r--r--test/README3
2 files changed, 4 insertions, 24 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index d17e53cc636..e39c665f216 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -275,28 +275,9 @@ If your test lasts longer than some few seconds, mark it in its
275'ert-deftest' definition with ":tags '(:expensive-test)". 275'ert-deftest' definition with ":tags '(:expensive-test)".
276 276
277To run tests on the entire Emacs tree, run "make check" from the 277To run tests on the entire Emacs tree, run "make check" from the
278top-level directory. Most tests are in the directory 278top-level directory. Most tests are in the directory "test/". From
279"test/". From the "test/" directory, run "make 279the "test/" directory, run "make <filename>" to run the tests for
280<filename>" to run the tests for <filename>.el(c). See 280<filename>.el(c). See "test/README" for more information.
281"test/Makefile" for more information.
282
283Tests which are tagged ":expensive-test" are enabled additionally, if
284you run "make check-expensive" from the top-level directory. "make
285<filename>" as mentioned above incorporates expensive tests for
286<filename>.el(c). You can also define any ert selector on the command
287line. So "make check SELECTOR=nil" is equivalent to "make
288check-expensive".
289
290You could also use predefined selectors of the Makefile. "make
291<filename> SELECTOR='$(SELECTOR_DEFAULT)'" runs all tests for
292<filename>.el(c) except the tests tagged as expensive.
293
294Selectors can be defined with different methods, see (info "(ert)Test
295Selectors") or
296https://www.gnu.org/software/emacs/manual/html_node/ert/Test-Selectors.html
297If your test file contains the tests "test-foo", "test2-foo" and
298"test-foo-remote", and you want to run only the former two tests, you
299could use a regexp: "make <filename> SELECTOR='\"foo$$\"'" .
300 281
301** Understanding Emacs internals 282** Understanding Emacs internals
302 283
diff --git a/test/README b/test/README
index d2aee9bf57b..2994fca6c85 100644
--- a/test/README
+++ b/test/README
@@ -8,8 +8,7 @@ Emacs uses ERT, Emacs Lisp Regression Testing, for testing. See (info
8"(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/ 8"(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/
9for more information on writing and running tests. 9for more information on writing and running tests.
10 10
11All ERT test files are supposed to run from subdirectory automated/. 11The Makefile in this directory supports the following targets:
12The Makefile in that directory supports the following targets:
13 12
14* make check 13* make check
15 Run all tests as defined in the directory. Expensive tests are 14 Run all tests as defined in the directory. Expensive tests are