[commit: ghc] wip/ci-i386, wip/linters, wip/ww-noinline: Run some of Haddock's tests in the testsuite (4a09d30)

[git at git.haskell.org]

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

On branches: wip/ci-i386,wip/linters,wip/ww-noinline
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a09d30bffa0c9df10ab5e7d22293c1f39c75728/ghc

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

commit 4a09d30bffa0c9df10ab5e7d22293c1f39c75728
Author: Alec Theriault <alec.theriault at gmail.com>
Date:   Mon Feb 4 22:06:07 2019 -0800

    Run some of Haddock's tests in the testsuite
    
    The 4 main testsuites in Haddock don't have many dependencies, but are
    regularly broken in small ways by changes to the GHC AST or the GHC API.
    The main gotcha is that we'll have to make sure that `haddock-test` and
    the test suite don't add modules without modifying this test. Then again,
    if that happens, the test will fail and someone will noticed.


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

4a09d30bffa0c9df10ab5e7d22293c1f39c75728
 testsuite/tests/haddock/haddock_testsuite/Makefile | 70 ++++++++++++++++++++++
 testsuite/tests/haddock/haddock_testsuite/all.T    | 19 ++++++
 utils/haddock                                      |  2 +-
 3 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/haddock/haddock_testsuite/Makefile b/testsuite/tests/haddock/haddock_testsuite/Makefile
new file mode 100644
index 0000000..59a4a17
--- /dev/null
+++ b/testsuite/tests/haddock/haddock_testsuite/Makefile
@@ -0,0 +1,70 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Remark: these should be synced up with the testsuites listed in `utils/haddock/haddock.cabal`
+# See #16206
+
+
+# Corresponds to files in the `haddock-test` package
+haddockTest=$(TOP)/../utils/haddock/haddock-test/src/Test/Haddock.hs \
+						$(TOP)/../utils/haddock/haddock-test/src/Test/Haddock/Config.hs \
+						$(TOP)/../utils/haddock/haddock-test/src/Test/Haddock/Utils.hs \
+						$(TOP)/../utils/haddock/haddock-test/src/Test/Haddock/Xhtml.hs \
+						$(TOP)/../utils/haddock/haddock-test/src/Test/Haddock/Process.hs
+
+# Corresponds to the `html-test` testsuite
+.PHONY: htmlTest
+htmlTest:
+	'$(TEST_HC)' \
+		-odir . \
+		-package Cabal \
+		-o html-test \
+		$(haddockTest) \
+		$(TOP)/../utils/haddock/html-test/Main.hs
+	./html-test \
+		--ghc-path=$(TEST_HC) \
+		--haddock-path=$(HADDOCK) \
+		--haddock-stdout=haddock-out.log
+
+# Corresponds to the `latex-test` testsuite
+.PHONY: latexTest
+latexTest:
+	'$(TEST_HC)' \
+		-odir . \
+		-package Cabal \
+		-o latex-test \
+		$(haddockTest) \
+		$(TOP)/../utils/haddock/latex-test/Main.hs
+	./latex-test \
+		--ghc-path=$(TEST_HC) \
+		--haddock-path=$(HADDOCK) \
+		--haddock-stdout=haddock-out.log
+
+# Corresponds to the `hoogle-test` testsuite
+.PHONY: hoogleTest
+hoogleTest:
+	'$(TEST_HC)' \
+		-odir . \
+		-package Cabal \
+		-o hoogle-test \
+		$(haddockTest) \
+		$(TOP)/../utils/haddock/hoogle-test/Main.hs
+	./hoogle-test \
+		--ghc-path=$(TEST_HC) \
+		--haddock-path=$(HADDOCK) \
+		--haddock-stdout=haddock-out.log
+
+# Corresponds to the `hypsrc-test` testsuite
+.PHONY: hypsrcTest
+hypsrcTest:
+	'$(TEST_HC)' \
+		-odir . \
+		-package Cabal \
+		-o hypsrc-test \
+		$(haddockTest) \
+		$(TOP)/../utils/haddock/hypsrc-test/Main.hs
+	./hypsrc-test \
+		--ghc-path=$(TEST_HC) \
+		--haddock-path=$(HADDOCK) \
+		--haddock-stdout=haddock-out.log
diff --git a/testsuite/tests/haddock/haddock_testsuite/all.T b/testsuite/tests/haddock/haddock_testsuite/all.T
new file mode 100644
index 0000000..1aa387b
--- /dev/null
+++ b/testsuite/tests/haddock/haddock_testsuite/all.T
@@ -0,0 +1,19 @@
+test('haddockHtmlTest',
+     [ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
+     makefile_test,
+     ['htmlTest'])
+
+test('haddockLatexTest',
+     [ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
+     makefile_test,
+     ['latexTest'])
+
+test('haddockHoogleTest',
+     [ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
+     makefile_test,
+     ['hoogleTest'])
+
+test('haddockHypsrcTest',
+     [ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
+     makefile_test,
+     ['hypsrcTest'])
diff --git a/utils/haddock b/utils/haddock
index 3ee6526..33cdd81 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 3ee6526d4ae7bf4deb7cd1caf24b3d7355573576
+Subproject commit 33cdd810e4222b92bc22f7f5b7196fc97fd3cea6