git.iko.soy/typeable/servant-reflex
on master help sign in
ghc compat and testsuite building
commitc5239c7857cf5a163ccfd7b66fdde3874d6fb2f8 authorGreg Hale <imalsogreg@gmail.com> dateWed 3 Aug 2016, 21:49 (10 years ago) parentbbeb455
5 files changed+14−9
compare with master
unifiedsplit
.gitmodules−3 .travis.yml+2−2 runTestsAndCoverage.sh+4−2 servant-reflex.cabal+3−2 src/Servant/Common/Req.hs+5
.gitmodules−3
@@ -16,6 +16,3 @@
1616[submodule "deps/reflex-dom-contrib"]
1717 path = deps/reflex-dom-contrib
1818 url = https://github.com/reflex-frp/reflex-dom-contrib
19−[submodule "deps/ghcjs-dom"]
20− path = deps/ghcjs-dom
21− url = https://github.com/ghcjs/ghcjs-dom
.travis.yml+2−2
@@ -7,8 +7,8 @@ script:
77- git config --global user.email "travis-ci@example.com"
88- git config --global user.name "Travis-CI"
99- git submodule update --init --recursive
10−- deps/reflex-platform/work-on ghcjs ./. --command "cabal new-build --ghcjs"
11−- deps/reflex-platform/work-on ghcjs ./. --command "cabal new-build --ghcjs --enable-tests && ./deploy.sh"
10+- deps/reflex-platform/work-on ghc ./. --command "cabal configure --enable-tests && cabal build"
11+- deps/reflex-platform/work-on ghc ./. --command "cabal configure --enable tests && cabal build && ./deploy.sh"
1212
1313cache:
1414 directories:
runTestsAndCoverage.sh+4−2
@@ -3,9 +3,11 @@
33set -e
44
55# All directory variables relative to project root
6−DIR=dist-newstyle/hpc
6+# DIR=dist-newstyle/hpc
7+DIR=dist/hpc
78
8−SUITE=./dist-newstyle/build/servant-reflex-0.2/build/testsuite/testsuite
9+#SUITE=./dist-newstyle/build/servant-reflex-0.2/build/testsuite/testsuite
10+SUITE=./dist/build/testsuite/testsuite
911
1012if [ -z "$DEBUG" ]; then
1113 export DEBUG=snap-testsuite
servant-reflex.cabal+3−2
@@ -43,7 +43,7 @@ library
4343 if impl(ghcjs)
4444 build-depends: ghcjs-base >= 0.2 && < 0.3
4545
46− ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
46+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
4747
4848 default-language: Haskell2010
4949
@@ -58,7 +58,8 @@ test-suite testsuite
5858 type: exitcode-stdio-1.0
5959 main-is: Tests.hs
6060 hs-source-dirs: test
61− ghc-prof-options: -prof -auto
61+ ghc-prof-options: -auto
6262 ghc-options: -Wall -fwarn-tabs -O2 -fhpc -threaded
6363 other-modules:
64+ default-language: Haskell2010
6465 build-depends: base
src/Servant/Common/Req.hs+5
@@ -189,7 +189,12 @@ performRequest reqMeth req reqHost trigger = do
189189 okReqs = fmapMaybe (either (const Nothing) Just) reqs
190190 badReqs = fmapMaybe (either Just (const Nothing)) reqs
191191
192+#ifndef ghcjs_HOST_OS
193+ resps <- performRequestAsync (fmap LT.toStrict <$> okReqs)
194+#else
192195 resps <- performRequestAsync (fmap LT.unpack <$> okReqs)
196+#endif
197+
193198 return (resps, badReqs)
194199
195200 -- let oneNamedPair :: String -> [QueryPart] -> String