From a9334ad90ac25773e4edf4b33cdd2aa8cd11f4d1 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> Date: Fri, 19 Feb 2016 00:48:46 +0100 Subject: [PATCH] Whitespace. --- Cabal/tests/PackageTests/Tests.hs | 14 ++++++++++++++ HACKING.md | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Cabal/tests/PackageTests/Tests.hs b/Cabal/tests/PackageTests/Tests.hs index 37236721f5..febd5e7b41 100644 --- a/Cabal/tests/PackageTests/Tests.hs +++ b/Cabal/tests/PackageTests/Tests.hs @@ -221,6 +221,20 @@ nonSharedLibTests config = cabal_build ["--enable-tests"] cabal "test" [] + -- Test that '--allow-newer' works via the 'Setup.hs configure' interface. + , tc "AllowNewer" $ do + shouldFail $ cabal "configure" [] + cabal "configure" ["--allow-newer"] + shouldFail $ cabal "configure" ["--allow-newer=baz,quux"] + cabal "configure" ["--allow-newer=base", "--allow-newer=baz,quux"] + shouldFail $ cabal "configure" ["--enable-tests"] + cabal "configure" ["--enable-tests", "--allow-newer"] + shouldFail $ cabal "configure" ["--enable-benchmarks"] + cabal "configure" ["--enable-benchmarks", "--allow-newer"] + shouldFail $ cabal "configure" ["--enable-benchmarks", "--enable-tests"] + cabal "configure" ["--enable-benchmarks", "--enable-tests" + ,"--allow-newer"] + -- Test that Cabal can choose flags to disable building a component when that -- component's dependencies are unavailable. The build should succeed without -- requiring the component's dependencies or imports. diff --git a/HACKING.md b/HACKING.md index cef49387ac..0b4595c0e7 100644 --- a/HACKING.md +++ b/HACKING.md @@ -70,7 +70,7 @@ To build and test the `Cabal` library, do: we cannot use `cabal` for the next steps; we need to use Setup instead. So, compile Setup.hs: - + ~~~~ ghc --make -threaded Setup.hs ~~~~ @@ -89,7 +89,7 @@ To build and test the `Cabal` library, do: ~~~~ ~/MyHaskellCode/cabal/Cabal/.cabal-sandbox/$SOMESTUFF-packages.conf.d ~~~~ - + (or, as a relative path with my setup:) ~~~~ -- GitLab