Tue Nov 28 11:42:32 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/1555134703d5b1bb832361abf276fd651eff398c

>---------------------------------------------------------------

commit 1555134703d5b1bb832361abf276fd651eff398c
Merge: fa03f80 27ffb2c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Dec 20 00:54:11 2015 +0100

    Merge remote-tracking branch 'mrhania/testing-framework-improvements' into ghc-head


>---------------------------------------------------------------

1555134703d5b1bb832361abf276fd651eff398c
 .gitignore                                 |   2 +
 .travis.yml                                |   2 +
 README.md                                  |  45 +++--
 haddock-api/src/Haddock/Backends/Hoogle.hs |   3 +
 haddock-test/haddock-test.cabal            |  28 +++
 haddock-test/src/Test/Haddock.hs           | 149 +++++++++++++++
 haddock-test/src/Test/Haddock/Config.hs    | 282 +++++++++++++++++++++++++++++
 haddock-test/src/Test/Haddock/Process.hs   |  48 +++++
 haddock-test/src/Test/Haddock/Utils.hs     |  50 +++++
 haddock-test/src/Test/Haddock/Xhtml.hs     |  94 ++++++++++
 haddock.cabal                              |  19 +-
 hoogle-test/Main.hs                        |  31 ++++
 hoogle-test/ref/assoc-types/test.txt       |  14 ++
 hoogle-test/ref/classes/test.txt           |  17 ++
 hoogle-test/ref/fixity/test.txt            |  13 ++
 hoogle-test/ref/modules/test.txt           |  13 ++
 hoogle-test/run                            |   6 +
 hoogle-test/src/assoc-types/AssocTypes.hs  |  23 +++
 hoogle-test/src/classes/Classes.hs         |  16 ++
 hoogle-test/src/fixity/Fixity.hs           |  12 ++
 hoogle-test/src/modules/Bar.hs             |  12 ++
 hoogle-test/src/modules/Foo.hs             |   9 +
 html-test/Main.hs                          |  51 ++++++
 html-test/README.markdown                  |  27 ---
 html-test/accept.lhs                       |  49 -----
 html-test/run                              |   6 +
 html-test/run.lhs                          | 191 -------------------
 hypsrc-test/Main.hs                        |  50 +++++
 hypsrc-test/Utils.hs                       |  47 -----
 hypsrc-test/accept.hs                      |  27 ---
 hypsrc-test/run                            |   6 +
 hypsrc-test/run.hs                         | 122 -------------
 latex-test/Main.hs                         |  27 +++
 latex-test/accept.lhs                      |  46 -----
 latex-test/ref/Simple/Simple.tex           |   3 +-
 latex-test/run                             |   6 +
 latex-test/run.lhs                         | 162 -----------------
 37 files changed, 1017 insertions(+), 691 deletions(-)