From 73751a9a14f2cd2419486032dd439e7d60f468d2 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus <oleg.grenrus@iki.fi> Date: Sun, 7 Jul 2019 15:11:31 +0300 Subject: [PATCH] v2-haddock should fail when v2-build fails --- .../PackageTests/NewHaddock/Fails/Example.hs | 6 ++++++ .../PackageTests/NewHaddock/Fails/cabal.out | 15 +++++++++++++++ .../PackageTests/NewHaddock/Fails/cabal.project | 1 + .../PackageTests/NewHaddock/Fails/cabal.test.hs | 6 ++++++ .../PackageTests/NewHaddock/Fails/example.cabal | 9 +++++++++ 5 files changed, 37 insertions(+) create mode 100644 cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs create mode 100644 cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out create mode 100644 cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project create mode 100644 cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs create mode 100644 cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs b/cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs new file mode 100644 index 0000000000..76287b43f7 --- /dev/null +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs @@ -0,0 +1,6 @@ +module Example where + +import Prelude + +example :: Int +example = False diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out new file mode 100644 index 0000000000..cbfc470cbb --- /dev/null +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out @@ -0,0 +1,15 @@ +# cabal v2-build +Resolving dependencies... +Build profile: -w ghc-<GHCVER> -O1 +In order, the following will be built: + - example-1.0 (lib) (first run) +Configuring library for example-1.0.. +Preprocessing library for example-1.0.. +Building library for example-1.0.. +# cabal v2-haddock +Build profile: -w ghc-<GHCVER> -O1 +In order, the following will be built: + - example-1.0 (lib) (first run) +Preprocessing library for example-1.0.. +Running Haddock on library for example-1.0.. +cabal: Failed to build documentation for example-1.0-inplace. diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project new file mode 100644 index 0000000000..5356e76f67 --- /dev/null +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project @@ -0,0 +1 @@ +packages: . \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs new file mode 100644 index 0000000000..e872b31645 --- /dev/null +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs @@ -0,0 +1,6 @@ +import Test.Cabal.Prelude +import System.Exit (ExitCode (..)) + +main = cabalTest $ do + fails $ cabal "v2-build" ["example"] + fails $ cabal "v2-haddock" ["example"] diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal b/cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal new file mode 100644 index 0000000000..5096de78b5 --- /dev/null +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal @@ -0,0 +1,9 @@ +name: example +version: 1.0 +build-type: Simple +cabal-version: >=1.10 + +library + default-language: Haskell2010 + build-depends: base + exposed-modules: Example -- GitLab