* ert.texi (Running Tests Interactively): Adapt examle output.

(Tests and Their Environment): Mention skip-unless.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ad045fc6d5f6d50fac2afcd6c7e3220fc244aa26..1396fc12f43f812b3d43ad117fc2e521351018e2 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-24  Michael Albinus  <michael.albinus@gmx.de>
+
+       * ert.texi (Running Tests Interactively): Adapt examle output.
+       (Tests and Their Environment): Mention skip-unless.
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
        * dired-x.texi, ebrowse.texi, ede.texi, eieio.texi, eshell.texi:

diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 8728d53ea27502b2c18bb665ee20d194d87c1167..ac87b98eae988b4ab0dd2f7e14f6f3c260ef9886 100644 (file)
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -183,9 +183,10 @@ tests run.  It looks like this:
 
 @example
 Selector: t
-Passed: 31
-Failed: 2 (2 unexpected)
-Total:  33/33
+Passed:  31
+Skipped: 0
+Failed:  2 (2 unexpected)
+Total:   33/33
 
 Started at:   2008-09-11 08:39:25-0700
 Finished.
@@ -454,6 +455,19 @@ versions, specific architectures, etc.:
 @node Tests and Their Environment
 @section Tests and Their Environment
 
+Sometimes, it doesn't make sense to run a test due to missing
+preconditions.  A required Emacs feature might not be compiled in, the
+function to be tested could call an external binary which might not be
+available on the test machine, you name it.  In this case, the macro
+@code{skip-unless} could be used to skip the test:
+
+@lisp
+(ert-deftest test-dbus ()
+  "A test that checks D-BUS functionality."
+  (skip-unless (featurep 'dbusbind))
+  ...)
+@end lisp
+
 The outcome of running a test should not depend on the current state
 of the environment, and each test should leave its environment in the
 same state it found it in.  In particular, a test should not depend on