git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1420 from erdeszt/move-werror-to-travis-config

Move -Werror to travis config

commit5fae3534d873cf1832d8d5f9c8785d3d02ad3cb7 authorPhil Freeman <paf31@cantab.net> dateTue 25 Aug 2015, 15:37 (11 years ago) parent539d7bc058e45d
6 files changed+12−3
compare with golang
unifiedsplit
.travis.yml+1−1 psci/tests/Main.hs+3 src/Language/PureScript/Sugar/Names/Exports.hs+1−1 src/Language/PureScript/Sugar/Names/Imports.hs+1−1 tests/Main.hs+5 tests/common/TestsSetup.hs+1
.travis.yml+1−1
@@ -56,7 +56,7 @@ install:
5656 - cp -r .cabal-sandbox ~/cabal-sandboxes/$GHCVER-${STACKAGE:-none}
5757script:
5858 - ./travis/configure.sh
59− - cabal build
59+ - cabal build --ghc-options="-Werror"
6060 - cabal test
6161 - ./travis/test-install.sh
6262after_script:
psci/tests/Main.hs+3
@@ -1,11 +1,14 @@
11{-# LANGUAGE RecordWildCards #-}
22{-# LANGUAGE TupleSections #-}
3+{-# LANGUAGE CPP #-}
34
45module Main where
56
67import Control.Monad.Trans.State.Strict (runStateT)
78import Control.Monad (when, forM)
9+#if __GLASGOW_HASKELL__ < 710
810import Control.Applicative
11+#endif
912import Control.Monad.Writer.Strict (runWriterT)
1013import Control.Monad.Trans.Except (runExceptT)
1114
src/Language/PureScript/Sugar/Names/Exports.hs+1−1
@@ -26,7 +26,7 @@ import Data.List (find, intersect)
2626import Data.Maybe (fromMaybe, mapMaybe)
2727
2828#if __GLASGOW_HASKELL__ < 710
29−import Control.Applicative (Applicative(..), (<$>), (<*>))
29+import Control.Applicative (Applicative(..), (<$>))
3030#endif
3131import Control.Monad
3232import Control.Monad.Error.Class (MonadError(..))
src/Language/PureScript/Sugar/Names/Imports.hs+1−1
@@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe, isNothing)
2323
2424import Control.Arrow (first)
2525#if __GLASGOW_HASKELL__ < 710
26−import Control.Applicative (Applicative(..), (<$>), (<*>))
26+import Control.Applicative (Applicative(..), (<$>))
2727#endif
2828import Control.Monad
2929import Control.Monad.Error.Class (MonadError(..))
tests/Main.hs+5
@@ -16,6 +16,7 @@
1616{-# LANGUAGE TupleSections #-}
1717{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1818{-# LANGUAGE FlexibleInstances #-}
19+{-# LANGUAGE CPP #-}
1920
2021-- Failing tests can specify the kind of error that should be thrown with a
2122-- @shouldFailWith declaration. For example:
@@ -41,14 +42,18 @@ import qualified Language.PureScript.CoreFn as CF
4142import Data.Char (isSpace)
4243import Data.Maybe (mapMaybe, fromMaybe)
4344import Data.List (isSuffixOf, sort, stripPrefix)
45+#if __GLASGOW_HASKELL__ < 710
4446import Data.Traversable (traverse)
47+#endif
4548import Data.Time.Clock (UTCTime())
4649
4750import qualified Data.Map as M
4851
4952import Control.Monad
5053import Control.Monad.IO.Class (liftIO)
54+#if __GLASGOW_HASKELL__ < 710
5155import Control.Applicative
56+#endif
5257import Control.Arrow ((>>>))
5358
5459import Control.Monad.Reader
tests/common/TestsSetup.hs+1
@@ -21,6 +21,7 @@ import Data.Maybe (fromMaybe)
2121import Control.Applicative
2222#endif
2323import Control.Monad
24+
2425import Control.Monad.Trans.Maybe
2526
2627import System.Process