From 6f22380332a8f38affc77fe1a9fe21d4e3bc83cc Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Mon, 28 Dec 2015 14:08:40 -0800 Subject: [PATCH] Failing test for #3004. Signed-off-by: Edward Z. Yang --- Cabal/tests/PackageTests/HaddockNewline/A.hs | 1 + .../PackageTests/HaddockNewline/ChangeLog.md | 5 ++++ .../HaddockNewline/HaddockNewline.cabal | 20 +++++++++++++ .../tests/PackageTests/HaddockNewline/LICENSE | 30 +++++++++++++++++++ .../PackageTests/HaddockNewline/Setup.hs | 2 ++ Cabal/tests/PackageTests/Tests.hs | 5 ++++ 6 files changed, 63 insertions(+) create mode 100644 Cabal/tests/PackageTests/HaddockNewline/A.hs create mode 100644 Cabal/tests/PackageTests/HaddockNewline/ChangeLog.md create mode 100644 Cabal/tests/PackageTests/HaddockNewline/HaddockNewline.cabal create mode 100644 Cabal/tests/PackageTests/HaddockNewline/LICENSE create mode 100644 Cabal/tests/PackageTests/HaddockNewline/Setup.hs diff --git a/Cabal/tests/PackageTests/HaddockNewline/A.hs b/Cabal/tests/PackageTests/HaddockNewline/A.hs new file mode 100644 index 00000000000..d843c00b782 --- /dev/null +++ b/Cabal/tests/PackageTests/HaddockNewline/A.hs @@ -0,0 +1 @@ +module A where diff --git a/Cabal/tests/PackageTests/HaddockNewline/ChangeLog.md b/Cabal/tests/PackageTests/HaddockNewline/ChangeLog.md new file mode 100644 index 00000000000..240e0691cc8 --- /dev/null +++ b/Cabal/tests/PackageTests/HaddockNewline/ChangeLog.md @@ -0,0 +1,5 @@ +# Revision history for HaddockNewline + +## 0.1.0.0 -- YYYY-mm-dd + +* First version. Released on an unsuspecting world. diff --git a/Cabal/tests/PackageTests/HaddockNewline/HaddockNewline.cabal b/Cabal/tests/PackageTests/HaddockNewline/HaddockNewline.cabal new file mode 100644 index 00000000000..681db5af839 --- /dev/null +++ b/Cabal/tests/PackageTests/HaddockNewline/HaddockNewline.cabal @@ -0,0 +1,20 @@ +name: HaddockNewline +version: 0.1.0.0 +synopsis: This has a + newline yo. +-- description: +license: BSD3 +license-file: LICENSE +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +extra-source-files: ChangeLog.md +cabal-version: >=1.10 + +library + exposed-modules: A + -- other-modules: + -- other-extensions: + build-depends: base + -- hs-source-dirs: + default-language: Haskell2010 diff --git a/Cabal/tests/PackageTests/HaddockNewline/LICENSE b/Cabal/tests/PackageTests/HaddockNewline/LICENSE new file mode 100644 index 00000000000..c8cc6abc283 --- /dev/null +++ b/Cabal/tests/PackageTests/HaddockNewline/LICENSE @@ -0,0 +1,30 @@ +Copyright (c) 2015, Edward Z. Yang + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Edward Z. Yang nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Cabal/tests/PackageTests/HaddockNewline/Setup.hs b/Cabal/tests/PackageTests/HaddockNewline/Setup.hs new file mode 100644 index 00000000000..9a994af677b --- /dev/null +++ b/Cabal/tests/PackageTests/HaddockNewline/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/Cabal/tests/PackageTests/Tests.hs b/Cabal/tests/PackageTests/Tests.hs index 52540f24914..6d54ed5ac6b 100644 --- a/Cabal/tests/PackageTests/Tests.hs +++ b/Cabal/tests/PackageTests/Tests.hs @@ -178,6 +178,11 @@ tests config = ["CPP.html", "Literate.html", "NoCPP.html", "Simple.html"] mapM_ (assertFindInFile "For hiding needles.") docFiles + -- Test that Haddock with a newline in synopsis works correctly, #3004 + , tc "HaddockNewline" $ do + cabal "configure" [] + cabal "haddock" [] + -- Test that Cabal properly orders GHC flags passed to GHC (when -- there are multiple ghc-options fields.) , tc "OrderFlags" $ cabal_build []