[Git][ghc/ghc][master] Make `haddock_testsuite` respect `--test-accept`

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
45616133 by Alec Theriault at 2019-06-11T22:41:14Z
Make `haddock_testsuite` respect `--test-accept`

Suppose you've made changes that affect the output of `haddockHtmlTest`
so that the following is failing:

    ./hadrian/build.sh -c --only=haddockHtmlTest test

Then, the following will accept new output for Haddock's test cases.

    ./hadrian/build.sh -c --only=haddockHtmlTest test --test-accept

You still do need to make sure those new changes (which show up in
Haddock's tree) get committed though.

Fixes #16694

- - - - -


2 changed files:

- testsuite/tests/haddock/haddock_testsuite/Makefile
- testsuite/tests/haddock/haddock_testsuite/all.T


Changes:

=====================================
testsuite/tests/haddock/haddock_testsuite/Makefile
=====================================
@@ -24,6 +24,7 @@ htmlTest:
 		$(haddockTest) \
 		$(TOP)/../utils/haddock/html-test/Main.hs
 	./html-test \
+		$(ACCEPT) \
 		--ghc-path=$(TEST_HC) \
 		--haddock-path=$(HADDOCK) \
 		--haddock-stdout=haddock-out.log
@@ -39,6 +40,7 @@ latexTest:
 		$(haddockTest) \
 		$(TOP)/../utils/haddock/latex-test/Main.hs
 	./latex-test \
+		$(ACCEPT) \
 		--ghc-path=$(TEST_HC) \
 		--haddock-path=$(HADDOCK) \
 		--haddock-stdout=haddock-out.log
@@ -54,6 +56,7 @@ hoogleTest:
 		$(haddockTest) \
 		$(TOP)/../utils/haddock/hoogle-test/Main.hs
 	./hoogle-test \
+		$(ACCEPT) \
 		--ghc-path=$(TEST_HC) \
 		--haddock-path=$(HADDOCK) \
 		--haddock-stdout=haddock-out.log
@@ -69,6 +72,7 @@ hypsrcTest:
 		$(haddockTest) \
 		$(TOP)/../utils/haddock/hypsrc-test/Main.hs
 	./hypsrc-test \
+		$(ACCEPT) \
 		--ghc-path=$(TEST_HC) \
 		--haddock-path=$(HADDOCK) \
 		--haddock-stdout=haddock-out.log


=====================================
testsuite/tests/haddock/haddock_testsuite/all.T
=====================================
@@ -1,19 +1,21 @@
+accept = 'ACCEPT=--accept' if config.accept else 'ACCEPT=""'
+
 test('haddockHtmlTest',
      [ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
      makefile_test,
-     ['htmlTest'])
+     ['htmlTest ' + accept])
 
 test('haddockLatexTest',
      [ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
      makefile_test,
-     ['latexTest'])
+     ['latexTest ' + accept])
 
 test('haddockHoogleTest',
      [ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
      makefile_test,
-     ['hoogleTest'])
+     ['hoogleTest ' + accept])
 
 test('haddockHypsrcTest',
      [ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
      makefile_test,
-     ['hypsrcTest'])
+     ['hypsrcTest ' + accept])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/45616133efba0c17a461ecf085427b7956250fad

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/45616133efba0c17a461ecf085427b7956250fad
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190611/d23ebda5/attachment-0001.html>