git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Use base-compat in tests
commit621a5a78bb02731632166e9bbd156bd3c21412ba authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 4 Nov 2015, 11:59 (11 years ago) parent3c357d9
3 files changed+8−17
purescript.cabal+2−2 tests/Main.hs+3−7 tests/common/TestsSetup.hs+3−8
purescript.cabal+2−2
@@ -260,7 +260,7 @@ test-suite tests
260260 build-depends: base >=4 && <5, containers -any, directory -any,
261261 filepath -any, mtl -any, parsec -any, purescript -any,
262262 transformers -any, process -any, transformers-compat -any, time -any,
263− Glob -any
263+ Glob -any, base-compat >=0.6.0
264264 type: exitcode-stdio-1.0
265265 main-is: Main.hs
266266 other-modules: TestsSetup
@@ -272,7 +272,7 @@ test-suite psci-tests
272272 mtl -any, optparse-applicative >= 0.10.0, parsec -any,
273273 haskeline >= 0.7.0.0, purescript -any, transformers -any,
274274 transformers-compat -any, process -any, HUnit -any, time -any,
275− Glob -any
275+ Glob -any, base-compat >=0.6.0
276276 type: exitcode-stdio-1.0
277277 main-is: Main.hs
278278 other-modules: TestsSetup
tests/Main.hs+3−7
@@ -16,7 +16,6 @@
1616{-# LANGUAGE TupleSections #-}
1717{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1818{-# LANGUAGE FlexibleInstances #-}
19−{-# LANGUAGE CPP #-}
2019
2120-- Failing tests can specify the kind of error that should be thrown with a
2221-- @shouldFailWith declaration. For example:
@@ -35,6 +34,9 @@
3534
3635module Main (main) where
3736
37+import Prelude ()
38+import Prelude.Compat
39+
3840import qualified Language.PureScript as P
3941import qualified Language.PureScript.CodeGen.JS as J
4042import qualified Language.PureScript.CoreFn as CF
@@ -42,18 +44,12 @@ import qualified Language.PureScript.CoreFn as CF
4244import Data.Char (isSpace)
4345import Data.Maybe (mapMaybe, fromMaybe)
4446import Data.List (isSuffixOf, sort, stripPrefix)
45−#if __GLASGOW_HASKELL__ < 710
46−import Data.Traversable (traverse)
47−#endif
4847import Data.Time.Clock (UTCTime())
4948
5049import qualified Data.Map as M
5150
5251import Control.Monad
5352import Control.Monad.IO.Class (liftIO)
54−#if __GLASGOW_HASKELL__ < 710
55−import Control.Applicative
56−#endif
5753import Control.Arrow ((>>>))
5854
5955import Control.Monad.Reader
tests/common/TestsSetup.hs+3−8
@@ -10,18 +10,13 @@
1010-- |
1111--
1212-----------------------------------------------------------------------------
13−
14−{-# LANGUAGE CPP #-}
15−
1613module TestsSetup where
1714
18−import Data.Maybe (fromMaybe)
15+import Prelude ()
16+import Prelude.Compat
1917
20−#if __GLASGOW_HASKELL__ < 710
21−import Control.Applicative
22−#endif
18+import Data.Maybe (fromMaybe)
2319import Control.Monad
24−
2520import Control.Monad.Trans.Maybe
2621
2722import System.Process