Merge branch 'stable'

2025-02-25 18:55:22 -06:00 · 2016-07-15 00:51:29 +09:00 · 2016-07-15 00:51:29 +09:00 · a692009808
commit a692009808
parent 1dd249dd8d 736615c18c
33 changed files with 880 additions and 147 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,7 +13,7 @@ python:
  - "pypy"
 env:
  global:
-    - TEST=-v
+    - TEST='-v --with-timer --timer-top-n 25'
  matrix:
    - DOCUTILS=0.11
    - DOCUTILS=0.12
--- a/2
+++ b/2
@ -84,6 +84,8 @@ Release 1.4.6 (in development)
 Bugs fixed
 ----------

+* applehelp: Sphinx crashes if ``hiutil`` or ``codesign`` commands not found
+

 Release 1.4.5 (released Jul 13, 2016)
 =====================================
--- a/sphinx/builders/applehelp.py
+++ b/sphinx/builders/applehelp.py
@ -214,16 +214,19 @@ class AppleHelpBuilder(StandaloneHTMLBuilder):
            self.warn('you will need to index this help book with:\n  %s'
                      % (' '.join([pipes.quote(arg) for arg in args])))
        else:
-            p = subprocess.Popen(args,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
+            try:
+                p = subprocess.Popen(args,
+                                     stdout=subprocess.PIPE,
+                                     stderr=subprocess.STDOUT)

-            output = p.communicate()[0]
+                output = p.communicate()[0]

-            if p.returncode != 0:
-                raise AppleHelpIndexerFailed(output)
-            else:
-                self.info('done')
+                if p.returncode != 0:
+                    raise AppleHelpIndexerFailed(output)
+                else:
+                    self.info('done')
+            except OSError:
+                raise AppleHelpIndexerFailed('Command not found: %s' % args[0])

        # If we've been asked to, sign the bundle
        if self.config.applehelp_codesign_identity:
@ -245,16 +248,19 @@ class AppleHelpBuilder(StandaloneHTMLBuilder):
                self.warn('you will need to sign this help book with:\n  %s'
                          % (' '.join([pipes.quote(arg) for arg in args])))
            else:
-                p = subprocess.Popen(args,
-                                     stdout=subprocess.PIPE,
-                                     stderr=subprocess.STDOUT)
+                try:
+                    p = subprocess.Popen(args,
+                                         stdout=subprocess.PIPE,
+                                         stderr=subprocess.STDOUT)

-                output = p.communicate()[0]
+                    output = p.communicate()[0]

-                if p.returncode != 0:
-                    raise AppleHelpCodeSigningFailed(output)
-                else:
-                    self.info('done')
+                    if p.returncode != 0:
+                        raise AppleHelpCodeSigningFailed(output)
+                    else:
+                        self.info('done')
+                except OSError:
+                    raise AppleHelpCodeSigningFailed('Command not found: %s' % args[0])


 def setup(app):
--- a/test-reqs.txt
+++ b/test-reqs.txt
@ -1,5 +1,6 @@
 flake8
 nose
+nose-timer
 mock
 six>=1.4
 Jinja2>=2.3
--- a/tests/root/footnote.txt
+++ b/tests/root/footnote.txt
@ -53,9 +53,3 @@ footenotes
 .. [#] footnotes in table caption

 .. [#] footnotes in table
-
-
-missing target
--------------------
-[missing]_ citation
-
--- a/tests/root/images.txt
+++ b/tests/root/images.txt
@ -15,9 +15,6 @@ Sphinx image handling
 .. an image with unspecified extension
 .. image:: img.*

-.. a non-existing image with .*
-.. image:: foo.*
-
 .. a non-local image URI
 .. image:: http://www.python.org/logo.png

--- a/tests/root/includes.txt
+++ b/tests/root/includes.txt
@ -15,10 +15,6 @@ Test file and literal inclusion
 .. literalinclude:: literal.inc
   :language: python

-.. should give a warning
-.. literalinclude:: wrongenc.inc
-   :language: none
-
 .. should succeed
 .. literalinclude:: wrongenc.inc
   :encoding: latin-1
--- a/tests/root/markup.txt
+++ b/tests/root/markup.txt
@ -161,7 +161,6 @@ Adding \n to test unescaping.
 * :doc:`subdir/includes`
 * ``:download:`` is tested in includes.txt
 * :option:`Python -c option <python -c>`
-* This used to crash: :option:`&option`

 Test :abbr:`abbr (abbreviation)` and another :abbr:`abbr (abbreviation)`.

@ -295,13 +294,6 @@ Code blocks
       false
   end

-.. code-block:: c
-
-   import sys
-
-   sys.stdout.write('hello world!\n')
-
-
 Misc stuff
 ----------

@ -381,13 +373,6 @@ Index markup
   see: from; to
   seealso: fromalso; toalso

-Invalid index markup...
-
-.. index::
-   single:
-   pair:
-   keyword:
-
 .. index::
   !Main, !Other
   !single: entry; pair
--- a/tests/roots/test-basic/conf.py
+++ b/tests/roots/test-basic/conf.py
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'index'
+
+latex_documents = [
+    (master_doc, 'test.tex', 'The basic Sphinx documentation for testing', 'Sphinx', 'report')
+]
--- a/tests/roots/test-basic/index.rst
+++ b/tests/roots/test-basic/index.rst
@ -0,0 +1,29 @@
+The basic Sphinx documentation for testing
+==========================================
+
+Sphinx is a tool that makes it easy to create intelligent and beautiful
+documentation for Python projects (or other documents consisting of multiple
+reStructuredText sources), written by Georg Brandl.  It was originally created
+for the new Python documentation, and has excellent facilities for Python
+project documentation, but C/C++ is supported as well, and more languages are
+planned.
+
+Sphinx uses reStructuredText as its markup language, and many of its strengths
+come from the power and straightforwardness of reStructuredText and its parsing
+and translating suite, the Docutils.
+
+Among its features are the following:
+
+* Output formats: HTML (including derivative formats such as HTML Help, Epub
+  and Qt Help), plain text, manual pages and LaTeX or direct PDF output
+  using rst2pdf
+* Extensive cross-references: semantic markup and automatic links
+  for functions, classes, glossary terms and similar pieces of information
+* Hierarchical structure: easy definition of a document tree, with automatic
+  links to siblings, parents and children
+* Automatic indices: general index as well as a module index
+* Code handling: automatic highlighting using the Pygments highlighter
+* Flexible HTML output using the Jinja 2 templating engine
+* Various extensions are available, e.g. for automatic testing of snippets
+  and inclusion of appropriately formatted docstrings
+* Setuptools integration
--- a/tests/roots/test-ext-math-simple/conf.py
+++ b/tests/roots/test-ext-math-simple/conf.py
@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'index'
+
+latex_documents = [
+    (master_doc, 'test.tex', 'Math Extension Testing', 'Sphinx', 'report')]
--- a/tests/roots/test-ext-math-simple/index.rst
+++ b/tests/roots/test-ext-math-simple/index.rst
@ -0,0 +1,4 @@
+Test Math
+=========
+
+.. math:: a^2+b^2=c^2
--- a/tests/roots/test-ext-math/math.rst
+++ b/tests/roots/test-ext-math/math.rst
@ -0,0 +1,31 @@
+Test math extensions :math:`E = m c^2`
+======================================
+
+This is inline math: :math:`a^2 + b^2 = c^2`.
+
+.. math:: a^2 + b^2 = c^2
+
+.. math::
+
+   a + 1 < b
+
+.. math::
+   :label: foo
+
+   e^{i\pi} = 1
+
+.. math::
+   :label:
+
+   e^{ix} = \cos x + i\sin x
+
+.. math::
+
+   n \in \mathbb N
+
+.. math::
+   :nowrap:
+
+   a + 1 < b
+
+Referencing equation :eq:`foo`.
--- a/tests/roots/test-searchadapters/conf.py
+++ b/tests/roots/test-searchadapters/conf.py
@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'markup'
+source_suffix = '.txt'
--- a/tests/roots/test-searchadapters/markup.txt
+++ b/tests/roots/test-searchadapters/markup.txt
@ -0,0 +1,447 @@
+:tocdepth: 2
+
+.. title:: set by title directive
+
+Testing various markup
+======================
+
+Meta markup
+-----------
+
+.. sectionauthor:: Georg Brandl
+.. moduleauthor:: Georg Brandl
+
+.. contents:: TOC
+
+.. meta::
+   :author: Me
+   :keywords: docs, sphinx
+
+
+Generic reST
+------------
+
+A |subst| (the definition is in rst_epilog).
+
+.. highlight:: none
+
+.. _label:
+
+::
+
+   some code
+
+Option list:
+
+-h              help
+--help          also help
+
+Line block:
+
+| line1
+|   line2
+|     line3
+|       line4
+|   line5
+| line6
+|   line7
+
+
+Body directives
+^^^^^^^^^^^^^^^
+
+.. topic:: Title
+
+   Topic body.
+
+.. sidebar:: Sidebar
+   :subtitle: Sidebar subtitle
+
+   Sidebar body.
+
+.. rubric:: Test rubric
+
+.. epigraph:: Epigraph title
+
+   Epigraph body.
+
+   -- Author
+
+.. highlights:: Highlights
+
+   Highlights body.
+
+.. pull-quote:: Pull-quote
+
+   Pull quote body.
+
+.. compound::
+
+   a
+
+   b
+
+.. parsed-literal::
+
+   with some *markup* inside
+
+
+.. _admonition-section:
+
+Admonitions
+^^^^^^^^^^^
+
+.. admonition:: My Admonition
+
+   Admonition text.
+
+.. note::
+   Note text.
+
+.. warning::
+
+   Warning text.
+
+.. _some-label:
+
+.. tip::
+   Tip text.
+
+Indirect hyperlink targets
+
+.. _other-label: some-label_
+
+Inline markup
+-------------
+
+*Generic inline markup*
+
+Adding \n to test unescaping.
+
+* :command:`command\\n`
+* :dfn:`dfn\\n`
+* :guilabel:`guilabel with &accelerator and \\n`
+* :kbd:`kbd\\n`
+* :mailheader:`mailheader\\n`
+* :makevar:`makevar\\n`
+* :manpage:`manpage\\n`
+* :mimetype:`mimetype\\n`
+* :newsgroup:`newsgroup\\n`
+* :program:`program\\n`
+* :regexp:`regexp\\n`
+* :menuselection:`File --> Close\\n`
+* :menuselection:`&File --> &Print`
+* :file:`a/{varpart}/b\\n`
+* :samp:`print {i}\\n`
+
+*Linking inline markup*
+
+* :pep:`8`
+* :pep:`Python Enhancement Proposal #8 <8>`
+* :rfc:`1`
+* :rfc:`Request for Comments #1 <1>`
+* :envvar:`HOME`
+* :keyword:`with`
+* :token:`try statement <try_stmt>`
+* :ref:`admonition-section`
+* :ref:`here <some-label>`
+* :ref:`there <other-label>`
+* :ref:`my-figure`
+* :ref:`my-figure-name`
+* :ref:`my-table`
+* :ref:`my-table-name`
+* :ref:`my-code-block`
+* :ref:`my-code-block-name`
+* :numref:`my-figure`
+* :numref:`my-figure-name`
+* :numref:`my-table`
+* :numref:`my-table-name`
+* :numref:`my-code-block`
+* :numref:`my-code-block-name`
+* :doc:`subdir/includes`
+* ``:download:`` is tested in includes.txt
+* :option:`Python -c option <python -c>`
+* This used to crash: :option:`&option`
+
+Test :abbr:`abbr (abbreviation)` and another :abbr:`abbr (abbreviation)`.
+
+Testing the :index:`index` role, also available with
+:index:`explicit <pair: title; explicit>` title.
+
+.. _with:
+
+With
+----
+
+(Empty section.)
+
+
+Tables
+------
+
+.. tabularcolumns:: |L|p{5cm}|R|
+
+.. _my-table:
+
+.. table:: my table
+   :name: my-table-name
+
+   +----+----------------+----+
+   | 1  | * Block elems  |  x |
+   |    | * In table     |    |
+   +----+----------------+----+
+   | 2  | Empty cells:   |    |
+   +----+----------------+----+
+
+.. table:: empty cell in table header
+
+   ===== ======
+   \ 
+   ===== ======
+   1     2
+   3     4
+   ===== ======
+
+Tables with multirow and multicol:
+
+.. only:: latex
+
+   +----+----------------+---------+
+   | 1  | test!          | c       |
+   +----+---------+------+         |
+   | 2  | col     | col  |         |
+   | y  +---------+------+----+----+
+   | x  | multi-column cell   | x  |
+   +----+---------------------+----+
+
+   +----+
+   | 1  |
+   +    +
+   |    |
+   +----+
+
+.. list-table::
+   :header-rows: 0
+
+   * - .. figure:: img.png
+
+          figure in table
+
+
+Figures
+-------
+
+.. _my-figure:
+
+.. figure:: img.png
+   :name: my-figure-name
+
+   My caption of the figure
+
+   My description paragraph of the figure.
+
+   Description paragraph is wraped with legend node.
+
+.. figure:: rimg.png
+   :align: right
+
+   figure with align option
+
+.. figure:: rimg.png
+   :align: right
+   :figwidth: 50%
+
+   figure with align & figwidth option
+
+.. figure:: rimg.png
+   :align: right
+   :width: 3cm
+
+   figure with align & width option
+
+Version markup
+--------------
+
+.. versionadded:: 0.6
+   Some funny **stuff**.
+
+.. versionchanged:: 0.6
+   Even more funny stuff.
+
+.. deprecated:: 0.6
+   Boring stuff.
+
+.. versionadded:: 1.2
+
+   First paragraph of versionadded.
+
+.. versionchanged:: 1.2
+   First paragraph of versionchanged.
+
+   Second paragraph of versionchanged.
+
+
+Code blocks
+-----------
+
+.. _my-code-block:
+
+.. code-block:: ruby
+   :linenos:
+   :caption: my ruby code
+   :name: my-code-block-name
+
+   def ruby?
+       false
+   end
+
+.. code-block:: c
+
+   import sys
+
+   sys.stdout.write('hello world!\n')
+
+
+Misc stuff
+----------
+
+Stuff [#]_
+
+Reference lookup: [Ref1]_ (defined in another file).
+Reference lookup underscore: [Ref_1]_
+
+.. seealso:: something, something else, something more
+
+   `Google <http://www.google.com>`_
+       For everything.
+
+.. hlist::
+   :columns: 4
+
+   * This
+   * is
+   * a horizontal
+   * list
+   * with several
+   * items
+
+.. rubric:: Side note
+
+This is a side note.
+
+This tests :CLASS:`role names in uppercase`.
+
+.. centered:: LICENSE AGREEMENT
+
+.. acks::
+
+   * Terry Pratchett
+   * J. R. R. Tolkien
+   * Monty Python
+
+.. glossary::
+   :sorted:
+
+   boson
+      Particle with integer spin.
+
+   *fermion*
+      Particle with half-integer spin.
+
+   tauon
+   myon
+   electron
+      Examples for fermions.
+
+   über
+      Gewisse
+
+   änhlich
+      Dinge
+
+.. productionlist::
+   try_stmt: `try1_stmt` | `try2_stmt`
+   try1_stmt: "try" ":" `suite`
+            : ("except" [`expression` ["," `target`]] ":" `suite`)+
+            : ["else" ":" `suite`]
+            : ["finally" ":" `suite`]
+   try2_stmt: "try" ":" `suite`
+            : "finally" ":" `suite`
+
+
+Index markup
+------------
+
+.. index::
+   single: entry
+   pair: entry; pair
+   double: entry; double
+   triple: index; entry; triple
+   keyword: with
+   see: from; to
+   seealso: fromalso; toalso
+
+Invalid index markup...
+
+.. index::
+   single:
+   pair:
+   keyword:
+
+.. index::
+   !Main, !Other
+   !single: entry; pair
+
+:index:`!Main`
+
+.. _ölabel:
+
+Ö... Some strange characters
+----------------------------
+
+Testing öäü...
+
+
+Only directive
+--------------
+
+.. only:: html
+
+   In HTML.
+
+.. only:: latex
+
+   In LaTeX.
+
+.. only:: html or latex
+
+   In both.
+
+.. only:: confpytag and (testtag or nonexisting_tag)
+
+   Always present, because set through conf.py/command line.
+
+
+Any role
+--------
+
+.. default-role:: any
+
+Test referencing to `headings <with>` and `objects <func_without_body>`.
+Also `modules <mod>` and `classes <Time>`.
+
+More domains:
+
+* `JS <bar.baz>`
+* `C <SphinxType>`
+* `myobj` (user markup)
+* `n::Array`
+* `perl -c`
+
+.. default-role::
+
+
+.. rubric:: Footnotes
+
+.. [#] Like footnotes.
+
--- a/tests/roots/test-warnings/autodoc_fodder.py
+++ b/tests/roots/test-warnings/autodoc_fodder.py
@ -0,0 +1,7 @@
+
+class MarkupError(object):
+    """
+    .. note:: This is a docstring with a
+    small markup error which should have
+    correct location information.
+    """
--- a/tests/roots/test-warnings/conf.py
+++ b/tests/roots/test-warnings/conf.py
@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+sys.path.append(os.path.abspath('.'))
+
+master_doc = 'index'
+extensions = ['sphinx.ext.autodoc']
+
+latex_documents = [
+    (master_doc, 'test.tex', 'test-warnings', 'Sphinx', 'report')
+]
--- a/tests/roots/test-warnings/index.rst
+++ b/tests/roots/test-warnings/index.rst
@ -0,0 +1,48 @@
+test-warnings
+=============
+
+.. automodule:: autodoc_fodder
+   :noindex:
+
+   .. autoclass:: MarkupError
+
+.. a non-existing image with direct filename
+.. image:: foo.png
+
+.. a non-existing image with .*
+.. image:: foo.*
+
+.. an SVG image (for HTML at least)
+.. image:: svgimg.*
+
+.. a non-local image URI
+.. image:: http://www.python.org/logo.png
+
+.. should give a warning
+.. literalinclude:: wrongenc.inc
+   :language: none
+
+.. a non-existing download
+
+Don't download :download:`this <nonexisting.png>`.
+
+.. Invalid index markup
+.. index::
+   single:
+   pair:
+   keyword:
+
+.. Invalid code-block
+.. code-block:: c
+
+   import sys
+
+   sys.stdout.write('hello world!\n')
+
+.. unknown option
+
+This used to crash: :option:`&option`
+
+.. missing citation
+
+[missing]_ citation
--- a/tests/roots/test-warnings/svgimg.pdf
+++ b/tests/roots/test-warnings/svgimg.pdf
--- a/tests/roots/test-warnings/svgimg.svg
+++ b/tests/roots/test-warnings/svgimg.svg
@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="60"
+   width="60"
+   _SVGFile__filename="oldscale/apps/warning.svg"
+   version="1.0"
+   y="0"
+   x="0"
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.41"
+   sodipodi:docname="exclamation.svg"
+   sodipodi:docbase="/home/danny/work/icons/primary/scalable/actions">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0000000"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.5136000"
+     inkscape:cx="42.825186"
+     inkscape:cy="24.316071"
+     inkscape:window-width="1020"
+     inkscape:window-height="691"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient1160">
+      <stop
+         style="stop-color: #000000;stop-opacity: 1.0;"
+         id="stop1161"
+         offset="0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop1162"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1160"
+       id="linearGradient1163" />
+  </defs>
+  <metadata
+     id="metadata12">
+    <RDF
+       id="RDF13">
+      <Work
+         about=""
+         id="Work14">
+        <title
+           id="title15">Part of the Flat Icon Collection (Thu Aug 26 14:31:40 2004)</title>
+        <description
+           id="description17" />
+        <subject
+           id="subject18">
+          <Bag
+             id="Bag19">
+            <li
+               id="li20" />
+          </Bag>
+        </subject>
+        <publisher
+           id="publisher21">
+          <Agent
+             about=""
+             id="Agent22">
+            <title
+               id="title23" />
+          </Agent>
+        </publisher>
+        <creator
+           id="creator24">
+          <Agent
+             about=""
+             id="Agent25">
+            <title
+               id="title26">Danny Allen</title>
+          </Agent>
+        </creator>
+        <rights
+           id="rights28">
+          <Agent
+             about=""
+             id="Agent29">
+            <title
+               id="title30">Danny Allen</title>
+          </Agent>
+        </rights>
+        <date
+           id="date32" />
+        <format
+           id="format33">image/svg+xml</format>
+        <type
+           id="type35"
+           resource="http://purl.org/dc/dcmitype/StillImage" />
+        <license
+           id="license36"
+           resource="http://creativecommons.org/licenses/LGPL/2.1/">
+          <date
+             id="date37" />
+        </license>
+        <language
+           id="language38">en</language>
+      </Work>
+    </RDF>
+    <rdf:RDF
+       id="RDF40">
+      <cc:Work
+         rdf:about=""
+         id="Work41">
+        <dc:format
+           id="format42">image/svg+xml</dc:format>
+        <dc:type
+           id="type44"
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g2099">
+    <path
+       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.1250000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="M 55.311891,51.920745 L 4.6880989,51.920744 L 29.999995,8.0792542 L 55.311891,51.920745 z "
+       id="path1724" />
+    <path
+       style="color:#000000;fill:#ffe940;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.1250010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="M 55.311891,51.920745 L 4.6880989,51.920744 L 29.999995,8.0792542 L 55.311891,51.920745 z "
+       id="path1722" />
+    <path
+       style="font-size:12.000000;font-weight:900;fill:none;fill-opacity:1.0000000;stroke:#ffffff;stroke-width:8.1250000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 34.944960,10.779626 L 34.944960,33.186510 C 34.944960,34.752415 34.501979,36.081368 33.616007,37.173380 C 32.750636,38.265402 31.545298,38.811408 29.999995,38.811408 C 28.475302,38.811408 27.269965,38.265402 26.383993,37.173380 C 25.498020,36.060767 25.055030,34.731804 25.055030,33.186510 L 25.055030,10.779626 C 25.055030,9.1931155 25.498020,7.8641562 26.383993,6.7927462 C 27.269965,5.7007332 28.475302,5.1547262 29.999995,5.1547262 C 31.009593,5.1547262 31.885265,5.4019740 32.627010,5.8964706 C 33.389356,6.3909681 33.966274,7.0709005 34.357752,7.9362696 C 34.749221,8.7810349 34.944960,9.7288200 34.944960,10.779626 z "
+       id="path1099" />
+    <path
+       style="font-size:12.000000;font-weight:900;fill:#e71c02;fill-opacity:1.0000000;stroke:none;stroke-width:3.1249981;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000"
+       d="M 29.999995,3.5986440 C 28.102272,3.5986440 26.318514,4.3848272 25.156245,5.8173940 C 24.028906,7.1806889 23.499995,8.9087770 23.499995,10.786144 L 23.499995,33.192394 C 23.499995,35.036302 24.050685,36.772771 25.156245,38.161144 C 26.318514,39.593721 28.102273,40.379893 29.999995,40.379894 C 31.913354,40.379894 33.697195,39.576736 34.843745,38.129894 C 35.959941,36.754118 36.499995,35.052976 36.499995,33.192394 L 36.499995,10.786144 C 36.499995,9.5413010 36.276626,8.3551469 35.781245,7.2861440 C 35.278844,6.1755772 34.477762,5.2531440 33.468745,4.5986440 C 32.454761,3.9226545 31.264694,3.5986439 29.999995,3.5986440 z "
+       id="path835"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="M 36.506243,49.901522 C 36.506243,53.492972 33.591442,56.407773 29.999991,56.407773 C 26.408541,56.407773 23.493739,53.492972 23.493739,49.901522 C 23.493739,46.310071 26.408541,43.395270 29.999991,43.395270 C 33.591442,43.395270 36.506243,46.310071 36.506243,49.901522 z "
+       id="path1727" />
+    <path
+       style="color:#000000;fill:#e71c02;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:3.1250000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="M 36.506243,49.901522 C 36.506243,53.492972 33.591442,56.407773 29.999991,56.407773 C 26.408541,56.407773 23.493739,53.492972 23.493739,49.901522 C 23.493739,46.310071 26.408541,43.395270 29.999991,43.395270 C 33.591442,43.395270 36.506243,46.310071 36.506243,49.901522 z "
+       id="path1725" />
+  </g>
+</svg>
--- a/tests/roots/test-warnings/undecodable.rst
+++ b/tests/roots/test-warnings/undecodable.rst
--- a/tests/roots/test-warnings/wrongenc.inc
+++ b/tests/roots/test-warnings/wrongenc.inc
@ -0,0 +1,3 @@
+This file is encoded in latin-1 but at first read as utf-8.
+
+Max Strauß aß in München eine Leberkässemmel.
--- a/tests/test_build.py
+++ b/tests/test_build.py
@ -17,7 +17,7 @@ from textwrap import dedent
 from sphinx.errors import SphinxError
 import sphinx.builders.linkcheck

-from util import with_app, rootdir, tempdir, SkipTest, TestApp
+from util import with_app, with_tempdir, rootdir, tempdir, SkipTest, TestApp

 try:
    from docutils.writers.manpage import Writer as ManWriter
@ -76,16 +76,19 @@ def test_build_all():
        yield verify_build, buildername, srcdir


-@with_app(buildername='text')
-def test_master_doc_not_found(app, status, warning):
-    (app.srcdir / 'contents.txt').move(app.srcdir / 'contents.txt.bak')
+@with_tempdir
+def test_master_doc_not_found(tmpdir):
+    (tmpdir / 'conf.py').write_text('master_doc = "index"')
+    assert tmpdir.listdir() == ['conf.py']
+
    try:
+        app = TestApp(buildername='dummy', srcdir=tmpdir)
        app.builder.build_all()
        assert False  # SphinxError not raised
    except Exception as exc:
        assert isinstance(exc, SphinxError)
    finally:
-        (app.srcdir / 'contents.txt.bak').move(app.srcdir / 'contents.txt')
+        app.cleanup()


@with_app(buildername='text', testroot='circular')
--- a/tests/test_build_applehelp.py
+++ b/tests/test_build_applehelp.py
@ -43,8 +43,12 @@ def check_localization(outdir):
    assert (lprojdir / 'localized.txt').isfile()


-@with_app(buildername='applehelp')
+@with_app(buildername='applehelp', testroot='basic', srcdir='applehelp_output',
+          confoverrides={'applehelp_bundle_id': 'org.sphinx-doc.Sphinx.help',
+                         'applehelp_disable_external_tools': True})
 def test_applehelp_output(app, status, warning):
+    (app.srcdir / 'en.lproj').makedirs()
+    (app.srcdir / 'en.lproj' / 'localized.txt').write_text('')
    app.builder.build_all()

    # Have to use bundle_path, not outdir, because we alter the latter
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@ -24,26 +24,26 @@ TREE_BUILDER = getTreeBuilder('etree', implementation=ElementTree)
 HTML_PARSER = HTMLParser(TREE_BUILDER, namespaceHTMLElements=False)

 ENV_WARNINGS = """\
-(%(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \
-WARNING: Explicit markup ends without a blank line; unexpected \
-unindent\\.\\n?
-)?%(root)s/images.txt:\\d+: WARNING: image file not readable: foo.png
-%(root)s/images.txt:\\d+3: WARNING: nonlocal image URI found: \
-http://www.python.org/logo.png
-%(root)s/includes.txt:\\d+: WARNING: Encoding 'utf-8-sig' used for \
-reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \
-:encoding: option\\n?
-%(root)s/includes.txt:\\d+: WARNING: download file not readable: .*?nonexisting.png
-(%(root)s/markup.txt:\\d+: WARNING: invalid single index entry u'')?
-(%(root)s/undecodable.txt:\\d+: WARNING: undecodable source characters, replacing \
+(%(root)s/autodoc_fodder.py:docstring of autodoc_fodder.MarkupError:\\d+: \
+WARNING: duplicate object description of autodoc_fodder.MarkupError, other \
+instance in %(root)s/autodoc.rst, use :noindex: for one of them
+)?%(root)s/autodoc_fodder.py:docstring of autodoc_fodder.MarkupError:\\d+: \
+WARNING: Explicit markup ends without a blank line; unexpected unindent.
+%(root)s/index.rst:\\d+: WARNING: Encoding 'utf-8-sig' used for reading included \
+file u'%(root)s/wrongenc.inc' seems to be wrong, try giving an :encoding: option
+%(root)s/index.rst:\\d+: WARNING: image file not readable: foo.png
+%(root)s/index.rst:\\d+: WARNING: nonlocal image URI found: http://www.python.org/logo.png
+%(root)s/index.rst:\\d+: WARNING: download file not readable: %(root)s/nonexisting.png
+%(root)s/index.rst:\\d+: WARNING: invalid single index entry u''
+%(root)s/undecodable.rst:\\d+: WARNING: undecodable source characters, replacing \
 with "\\?": b?'here: >>>(\\\\|/)xbb<<<'
-)?"""
+"""

 HTML_WARNINGS = ENV_WARNINGS + """\
-%(root)s/images.txt:\\d+: WARNING: no matching candidate for image URI u'foo.\\*'
-%(root)s/markup.txt:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
-%(root)s/footnote.txt:\\d+: WARNING: citation not found: missing
-%(root)s/markup.txt:\\d+: WARNING: unknown option: &option
+%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*'
+%(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
+%(root)s/index.rst:\\d+: WARNING: unknown option: &option
+%(root)s/index.rst:\\d+: WARNING: citation not found: missing
 """

 if PY3:
@ -381,10 +381,8 @@ def check_extra_entries(outdir):
    assert (outdir / 'robots.txt').isfile()


-@gen_with_app(buildername='html', freshenv=True,  # use freshenv to check warnings
-              confoverrides={'html_context.hckey_co': 'hcval_co'},
-              tags=['testtag'])
-def test_html_output(app, status, warning):
+@with_app(buildername='html', testroot='warnings', freshenv=True)
+def test_html_warnings(app, status, warning):
    app.builder.build_all()
    html_warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
    html_warnings_exp = HTML_WARNINGS % {
@ -394,6 +392,11 @@ def test_html_output(app, status, warning):
        '--- Expected (regex):\n' + html_warnings_exp + \
        '--- Got:\n' + html_warnings

+
+@gen_with_app(buildername='html', tags=['testtag'],
+              confoverrides={'html_context.hckey_co': 'hcval_co'})
+def test_html_output(app, status, warning):
+    app.builder.build_all()
    for fname, paths in iteritems(HTML_XPATH):
        with (app.outdir / fname).open('rb') as fp:
            etree = HTML_PARSER.parse(fp)
@ -961,22 +964,6 @@ def test_enumerable_node(app, status, warning):
            yield check_xpath, etree, fname, xpath, check, be_found


-@with_app(buildername='html')
-def test_jsmath(app, status, warning):
-    app.builder.build_all()
-    content = (app.outdir / 'math.html').text()
-
-    assert '<div class="math">\na^2 + b^2 = c^2</div>' in content
-    assert '<div class="math">\n\\begin{split}a + 1 &lt; b\\end{split}</div>' in content
-    assert (u'<span class="eqno">(1)<a class="headerlink" href="#equation-foo" '
-            u'title="Permalink to this code">\xb6</a></span>'
-            u'<div class="math" id="equation-foo">\ne^{i\\pi} = 1</div>' in content)
-    assert ('<span class="eqno">(2)</span><div class="math">\n'
-            'e^{ix} = \\cos x + i\\sin x</div>' in content)
-    assert '<div class="math">\nn \\in \\mathbb N</div>' in content
-    assert '<div class="math">\na + 1 &lt; b</div>' in content
-
-
@with_app(buildername='html', testroot='html_assets')
 def test_html_assets(app, status, warning):
    app.builder.build_all()
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@ -24,10 +24,10 @@ from test_build_html import ENV_WARNINGS


 LATEX_WARNINGS = ENV_WARNINGS + """\
-%(root)s/markup.txt:\\d+: WARNING: unknown option: &option
-%(root)s/footnote.txt:\\d+: WARNING: citation not found: missing
-%(root)s/images.txt:\\d+: WARNING: no matching candidate for image URI u'foo.\\*'
-%(root)s/markup.txt:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
+%(root)s/index.rst:\\d+: WARNING: unknown option: &option
+%(root)s/index.rst:\\d+: WARNING: citation not found: missing
+%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*'
+%(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
 """

 if PY3:
@ -63,17 +63,10 @@ def run_latex(outdir):
        raise SkipTest


-@with_app(buildername='latex', freshenv=True)  # use freshenv to check warnings
+@with_app(buildername='latex')
 def test_latex(app, status, warning):
    LaTeXTranslator.ignore_missing_images = True
    app.builder.build_all()
-    latex_warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
-    latex_warnings_exp = LATEX_WARNINGS % {
-        'root': re.escape(app.srcdir.replace(os.sep, '/'))}
-    assert re.match(latex_warnings_exp + '$', latex_warnings), \
-        'Warnings don\'t match:\n' + \
-        '--- Expected (regex):\n' + latex_warnings_exp + \
-        '--- Got:\n' + latex_warnings

    # file from latex_additional_files
    assert (app.outdir / 'svgimg.svg').isfile()
@ -133,7 +126,7 @@ def test_writer(app, status, warning):
            '\\end{wrapfigure}' in result)


-@with_app(buildername='latex', freshenv=True,  # use freshenv to check warnings
+@with_app(buildername='latex',
          confoverrides={'latex_documents': [
              ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation',
               'Georg Brandl \\and someone else', 'howto'),
@ -142,13 +135,6 @@ def test_writer(app, status, warning):
 def test_latex_howto(app, status, warning):
    LaTeXTranslator.ignore_missing_images = True
    app.builder.build_all()
-    latex_warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
-    latex_warnings_exp = LATEX_WARNINGS % {
-        'root': re.escape(app.srcdir.replace(os.sep, '/'))}
-    assert re.match(latex_warnings_exp + '$', latex_warnings), \
-        'Warnings don\'t match:\n' + \
-        '--- Expected (regex):\n' + latex_warnings_exp + \
-        '--- Got:\n' + latex_warnings

    # file from latex_additional_files
    assert (app.outdir / 'svgimg.svg').isfile()
@ -182,6 +168,19 @@ def test_latex_howto(app, status, warning):
    run_latex(app.outdir)


+@with_app(buildername='latex', testroot='warnings', freshenv=True)
+def test_latex_warnings(app, status, warning):
+    app.builder.build_all()
+
+    warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
+    warnings_exp = LATEX_WARNINGS % {
+        'root': re.escape(app.srcdir.replace(os.sep, '/'))}
+    assert re.match(warnings_exp + '$', warnings), \
+        'Warnings don\'t match:\n' + \
+        '--- Expected (regex):\n' + warnings_exp + \
+        '--- Got:\n' + warnings
+
+
@with_app(buildername='latex', testroot='numfig',
          confoverrides={'numfig': True})
 def test_numref(app, status, warning):
--- a/tests/test_build_texinfo.py
+++ b/tests/test_build_texinfo.py
@ -23,27 +23,32 @@ from test_build_html import ENV_WARNINGS


 TEXINFO_WARNINGS = ENV_WARNINGS + """\
-%(root)s/markup.txt:164: WARNING: unknown option: &option
-%(root)s/footnote.txt:60: WARNING: citation not found: missing
-%(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
-%(root)s/images.txt:29: WARNING: no matching candidate for image URI u'svgimg.\\*'
+%(root)s/index.rst:\\d+: WARNING: unknown option: &option
+%(root)s/index.rst:\\d+: WARNING: citation not found: missing
+%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*'
+%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'svgimg.\\*'
 """

 if PY3:
    TEXINFO_WARNINGS = remove_unicode_literals(TEXINFO_WARNINGS)


-@with_app('texinfo', freshenv=True)  # use freshenv to check warnings
+@with_app(buildername='texinfo', testroot='warnings', freshenv=True)
+def test_texinfo_warnings(app, status, warning):
+    app.builder.build_all()
+    warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
+    warnings_exp = TEXINFO_WARNINGS % {
+        'root': re.escape(app.srcdir.replace(os.sep, '/'))}
+    assert re.match(warnings_exp + '$', warnings), \
+        'Warnings don\'t match:\n' + \
+        '--- Expected (regex):\n' + warnings_exp + \
+        '--- Got:\n' + warnings
+
+
+@with_app(buildername='texinfo')
 def test_texinfo(app, status, warning):
    TexinfoTranslator.ignore_missing_images = True
    app.builder.build_all()
-    texinfo_warnings = strip_escseq(warning.getvalue().replace(os.sep, '/'))
-    texinfo_warnings_exp = TEXINFO_WARNINGS % {
-        'root': re.escape(app.srcdir.replace(os.sep, '/'))}
-    assert re.match(texinfo_warnings_exp + '$', texinfo_warnings), \
-        'Warnings don\'t match:\n' + \
-        '--- Expected (regex):\n' + texinfo_warnings_exp + \
-        '--- Got:\n' + texinfo_warnings
    # now, try to run makeinfo over it
    cwd = os.getcwd()
    os.chdir(app.outdir)
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@ -58,10 +58,6 @@ def test_images():
    htmlbuilder = StandaloneHTMLBuilder(app)
    htmlbuilder.imgpath = 'dummy'
    htmlbuilder.post_process_images(tree)
-    image_uri_message = "no matching candidate for image URI u'foo.*'"
-    if PY3:
-        image_uri_message = remove_unicode_literals(image_uri_message)
-    assert image_uri_message in app._warning.content[-1]
    assert set(htmlbuilder.images.keys()) == \
        set(['subdir/img.png', 'img.png', 'subdir/simg.png', 'svgimg.svg',
             'img.foo.png'])
@ -71,7 +67,6 @@ def test_images():
    app._warning.reset()
    latexbuilder = LaTeXBuilder(app)
    latexbuilder.post_process_images(tree)
-    assert image_uri_message in app._warning.content[-1]
    assert set(latexbuilder.images.keys()) == \
        set(['subdir/img.png', 'subdir/simg.png', 'img.png', 'img.pdf',
             'svgimg.pdf', 'img.foo.png'])
--- a/tests/test_ext_autosummary.py
+++ b/tests/test_ext_autosummary.py
@ -54,7 +54,7 @@ def test_mangle_signature():
        assert res == outp, (u"'%s' -> '%s' != '%s'" % (inp, res, outp))


-@with_app(buildername='html', **default_kw)
+@with_app(buildername='dummy', **default_kw)
 def test_get_items_summary(app, status, warning):
    # monkey-patch Autosummary.get_items so we can easily get access to it's
    # results..
--- a/tests/test_ext_ifconfig.py
+++ b/tests/test_ext_ifconfig.py
@ -12,6 +12,9 @@
 from util import with_app


-@with_app(testroot='ext-ifconfig')
+@with_app(buildername='text', testroot='ext-ifconfig')
 def test_ifconfig(app, status, warning):
    app.builder.build_all()
+    result = (app.outdir / 'index.txt').text()
+    assert 'spam' in result
+    assert 'ham' not in result
--- a/tests/test_ext_math.py
+++ b/tests/test_ext_math.py
@ -14,7 +14,24 @@ import re
 from util import with_app, SkipTest


-@with_app('html', testroot='ext-math',
+@with_app(buildername='html', testroot='ext-math',
+          confoverrides = {'extensions': ['sphinx.ext.jsmath'], 'jsmath_path': 'dummy.js'})
+def test_jsmath(app, status, warning):
+    app.builder.build_all()
+    content = (app.outdir / 'math.html').text()
+
+    assert '<div class="math">\na^2 + b^2 = c^2</div>' in content
+    assert '<div class="math">\n\\begin{split}a + 1 &lt; b\\end{split}</div>' in content
+    assert (u'<span class="eqno">(1)<a class="headerlink" href="#equation-foo" '
+            u'title="Permalink to this code">\xb6</a></span>'
+            u'<div class="math" id="equation-foo">\ne^{i\\pi} = 1</div>' in content)
+    assert ('<span class="eqno">(2)</span><div class="math">\n'
+            'e^{ix} = \\cos x + i\\sin x</div>' in content)
+    assert '<div class="math">\nn \\in \\mathbb N</div>' in content
+    assert '<div class="math">\na + 1 &lt; b</div>' in content
+
+
+@with_app('html', testroot='ext-math-simple',
          confoverrides = {'extensions': ['sphinx.ext.imgmath']})
 def test_imgmath_png(app, status, warning):
    app.builder.build_all()
@ -29,7 +46,7 @@ def test_imgmath_png(app, status, warning):
    assert re.search(html, content, re.S)


-@with_app('html', testroot='ext-math',
+@with_app('html', testroot='ext-math-simple',
          confoverrides={'extensions': ['sphinx.ext.imgmath'],
                         'imgmath_image_format': 'svg'})
 def test_imgmath_svg(app, status, warning):
--- a/tests/test_i18n.py
+++ b/tests/test_i18n.py
@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    test_i18n
-    ~~~~~~~~~
-
-    Test locale features.
-
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-from util import with_app
-
-
-@with_app(confoverrides={'language': 'de'})
-def test_i18n(app, status, warning):
-    app.builder.build_all()
--- a/tests/test_searchadapters.py
+++ b/tests/test_searchadapters.py
@ -22,7 +22,7 @@ def teardown_module():


 def search_adapter_helper(adapter):
-    settings = {'srcdir': rootdir / 'root',
+    settings = {'srcdir': rootdir / 'roots' / 'test-searchadapters',
                'builddir': tempdir / 'websupport',
                'status': StringIO(),
                'warning': StringIO(),