e1b6740 · streamly · git.iko.soy

git.iko.soy/streamly

reduce ci tests

commite1b6740a7cdf34a2bc68e579c9fe3ad323129009 authorHarendra Kumar <harendra.kumar@gmail.com> dateSat 11 Aug 2018, 17:58 (8 years ago) parent7f05a78

3 files changed+43−23

compare with master

unifiedsplit

.travis.yml+19−19 streamly.cabal+4−2 test/Prop.hs+20−2

.travis.yml+19−19

@@ -79,19 +79,19 @@ matrix:

7979

8080 # For 7.10.3 we disable -Werror because of some bogus SPECIALIZE pragma

8181 # warnings.

82− - env: BUILD=stack RESOLVER=lts-6 GHCVER=7.10.3 GHC_OPTIONS="" STACK_YAML=stack-7.10.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

83− addons: {apt: {packages: [cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}

82+ #- env: BUILD=stack RESOLVER=lts-6 GHCVER=7.10.3 GHC_OPTIONS="" STACK_YAML=stack-7.10.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

83+ # addons: {apt: {packages: [cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}

8484

85− - env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

86− addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

85+ #- env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

86+ # addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

8787

88− # Use cabal-install-1.24 for stack solver to work

89− - env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:diag"

90− addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

88+ ## Use cabal-install-1.24 for stack solver to work

89+ #- env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:diag"

90+ # addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

9191

92− # Use cabal-install-1.24 for stack solver to work

93− - env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y

94− addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}

92+ ## Use cabal-install-1.24 for stack solver to work

93+ #- env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y

94+ # addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}

9595

9696 # You can keep a STACK_YAML file at any path location

9797 #- env: BUILD=stack STACK_YAML=.ci/stack-8.0.yaml

@@ -116,14 +116,14 @@ matrix:

116116

117117 # Using stack builds, cabal builds get terminated because the tests

118118 # take more than 10 minutes and it does not produce any output until the end.

119− - env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3

120− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

119+ #- env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3

120+ # addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

121121

122− - env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3 GHC_OPTIONS="" STACK_BUILD_OPTIONS="--flag streamly:streamk"

123− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

122+ #- env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3 GHC_OPTIONS="" STACK_BUILD_OPTIONS="--flag streamly:streamk"

123+ # addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

124124

125− - env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""

126− addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}

125+ #- env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""

126+ # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}

127127

128128 # You can specify build flags like this:

129129 #- env: BUILD=cabal-new CABAL_NEWBUILD_OPTIONS="--flags=dev"

@@ -134,8 +134,8 @@ matrix:

134134 # --------------------------------------------------------------------------

135135

136136 # GHC 8.2.2/cabal build using stack!

137− - env: BUILD=cabal-new RESOLVER=lts-11 GHCVER=8.2.2 GHC_OPTIONS=""

138− os: osx

137+ #- env: BUILD=cabal-new RESOLVER=lts-11 GHCVER=8.2.2 GHC_OPTIONS=""

138+ # os: osx

139139

140140 # GHC 8.2.2/stack

141141 #- env: BUILD=stack RESOLVER=lts-11 GHCVER=8.2.2

@@ -145,7 +145,7 @@ matrix:

145145 # Lint e.g. HLINT_COMMANDS="hlint lint src; hlint lint test"

146146 # --------------------------------------------------------------------------

147147

148− - env: BUILD=stack RESOLVER=lts-11 HLINT_COMMANDS="hlint lint ."

148+ #- env: BUILD=stack RESOLVER=lts-11 HLINT_COMMANDS="hlint lint ."

149149

150150 # --------------------------------------------------------------------------

151151 # Build and send coverage report to coveralls.io using hpc-coveralls

streamly.cabal+4−2

@@ -190,11 +190,13 @@ library

190190-- Test suites

191191-------------------------------------------------------------------------------

192192

193+-- Compilation for coverage builds on CI machines takes too long without -O0

194+

193195test-suite test

194196 type: exitcode-stdio-1.0

195197 main-is: Main.hs

196198 hs-source-dirs: test

197− ghc-options: -O2 -Wall -threaded -with-rtsopts=-N

199+ ghc-options: -O0 -Wall -threaded -with-rtsopts=-N

198200 if flag(dev)

199201 ghc-options: -Wmissed-specialisations

200202 -Wall-missed-specialisations

@@ -221,7 +223,7 @@ test-suite properties

221223 type: exitcode-stdio-1.0

222224 main-is: Prop.hs

223225 hs-source-dirs: test

224− ghc-options: -O2 -Wall -threaded -with-rtsopts=-N

226+ ghc-options: -Wall -O0 -threaded -with-rtsopts=-N

225227 if flag(dev)

226228 cpp-options: -DDEVBUILD

227229 ghc-options: -Wmissed-specialisations

test/Prop.hs+20−2

@@ -692,50 +692,66 @@ main = hspec

692692

693693 let makeOps t =

694694 [ t

695+#ifndef COVERAGE_BUILD

695696 , t . maxRate 0

696697 , t . maxRate (-1)

697698 , t . maxBuffer 0

698−#ifndef COVERAGE_BUILD

699699 , t . maxBuffer 1

700−#endif

701700 , t . maxThreads 0

702701 , t . maxThreads 1

703702 , t . maxThreads (-1)

703+#endif

704704 ]

705705

706706 let serialOps :: IsStream t => ((SerialT IO a -> t IO a) -> Spec) -> Spec

707707 serialOps = forM_ $ (makeOps serially)

708+#ifndef COVERAGE_BUILD

708709 ++ [serially . maxRate 0.00000001]

709710 ++ [serially . maxBuffer (-1)]

711+#endif

710712 let wSerialOps :: IsStream t => ((WSerialT IO a -> t IO a) -> Spec) -> Spec

711713 wSerialOps = forM_ $ makeOps wSerially

714+#ifndef COVERAGE_BUILD

712715 ++ [wSerially . maxRate 0.00000001]

713716 ++ [wSerially . maxBuffer (-1)]

717+#endif

714718 let asyncOps :: IsStream t => ((AsyncT IO a -> t IO a) -> Spec) -> Spec

715719 asyncOps = forM_ $ makeOps asyncly

720+#ifndef COVERAGE_BUILD

716721 ++ [asyncly . maxRate 10000]

717722 ++ [asyncly . maxBuffer (-1)]

723+#endif

718724 let wAsyncOps :: IsStream t => ((WAsyncT IO a -> t IO a) -> Spec) -> Spec

719725 wAsyncOps = forM_ $ makeOps wAsyncly

726+#ifndef COVERAGE_BUILD

720727 ++ [wAsyncly . maxRate 10000]

721728 ++ [wAsyncly . maxBuffer (-1)]

729+#endif

722730 let aheadOps :: IsStream t => ((AheadT IO a -> t IO a) -> Spec) -> Spec

723731 aheadOps = forM_ $ makeOps aheadly

732+#ifndef COVERAGE_BUILD

724733 ++ [aheadly . maxRate 10000]

725734 ++ [aheadly . maxBuffer (-1)]

735+#endif

726736 let parallelOps :: IsStream t => ((ParallelT IO a -> t IO a) -> Spec) -> Spec

727737 parallelOps = forM_ $ makeOps parallely

738+#ifndef COVERAGE_BUILD

728739 ++ [parallely . maxRate 0.00000001]

729740 ++ [parallely . maxBuffer (-1)]

741+#endif

730742 let zipSerialOps :: IsStream t => ((ZipSerialM IO a -> t IO a) -> Spec) -> Spec

731743 zipSerialOps = forM_ $ makeOps zipSerially

744+#ifndef COVERAGE_BUILD

732745 ++ [zipSerially . maxRate 0.00000001]

733746 ++ [zipSerially . maxBuffer (-1)]

747+#endif

734748 -- Note, the "pure" of applicative Zip streams generates and infinite

735749 -- stream and therefore maxBuffer (-1) must not be used for that case.

736750 let zipAsyncOps :: IsStream t => ((ZipAsyncM IO a -> t IO a) -> Spec) -> Spec

737751 zipAsyncOps = forM_ $ makeOps zipAsyncly

752+#ifndef COVERAGE_BUILD

738753 ++ [zipAsyncly . maxRate 10000]

754+#endif

739755

740756 describe "Construction" $ do

741757 serialOps $ prop "serially replicateM" . constructWithReplicateM

@@ -883,11 +899,13 @@ main = hspec

883899 -- exclude those cases from these.

884900 let mkOps t =

885901 [ t

902+#ifndef COVERAGE_BUILD

886903 , t . maxRate 0

887904 , t . maxRate (-1)

888905 , t . maxBuffer 0

889906 , t . maxThreads 0

890907 , t . maxThreads (-1)

908+#endif

891909 ]

892910

893911 describe "Stream concurrent operations" $ do