From 4fe1006d0c440780957d676ad580525292b5e5c7 Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Sat, 2 Jan 2016 02:59:24 +0530 Subject: [PATCH] Makes tests run only on ghc 7.10. - doctest is unable to resolve cabal macros on ghc 7.8 so disabling tests on ghc 7.8. --- ringo.cabal | 11 +++++++---- src/Ringo/Generator/Populate/Dimension.hs | 5 ----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ringo.cabal b/ringo.cabal index 109c8cf..e205901 100644 --- a/ringo.cabal +++ b/ringo.cabal @@ -59,10 +59,13 @@ test-suite ringo-test type: exitcode-stdio-1.0 hs-source-dirs: test, src main-is: doctests.hs - build-depends: base - , ringo - , pretty-show >=1.6 && <1.7 - , doctest >=0.9 && <0.11 + if impl(ghc >= 7.10) + build-depends: base + , ringo + , pretty-show >=1.6 && <1.7 + , doctest >=0.9 && <0.11 + else + buildable: False default-language: Haskell2010 source-repository head diff --git a/src/Ringo/Generator/Populate/Dimension.hs b/src/Ringo/Generator/Populate/Dimension.hs index eead3b1..03d38d5 100644 --- a/src/Ringo/Generator/Populate/Dimension.hs +++ b/src/Ringo/Generator/Populate/Dimension.hs @@ -5,11 +5,6 @@ module Ringo.Generator.Populate.Dimension (dimensionTablePopulateSQL) where import qualified Data.Text as Text -#if MIN_VERSION_base(4,8,0) -#else -import Control.Applicative ((<$>)) -#endif - import Control.Monad.Reader (Reader, asks) import Data.Maybe (fromJust) import Data.Monoid ((<>))