git.iko.soy/project-m36
on master help sign in
Fix failure to typecheck test case by pushing all assertions to the end of the test and operating with all dependencies on the Either type inside a do block.
commit20ed3ab5e64b92510ef5b15ba5e1a32a25d8adae authorDiogo Biazus <diogo@biazus.me> dateSat 16 Dec 2017, 23:04 (9 years ago) parenta80f8b2
3 files changed+28−29
compare with master
unifiedsplit
.travis.yml+24−23 .travis/install-stack.sh−2 test/Relation/StaticOptimizer.hs+4−4
.travis.yml+24−23
@@ -1,5 +1,5 @@
11# For more information, see https://github.com/ChrisPenner/haskell-stack-travis-ci
2−language: nix
2+language: c
33sudo: false
44
55git:
@@ -15,45 +15,46 @@ cache:
1515matrix:
1616 fast_finish: true
1717 include:
18− - env: GHCVER=7.10.3 CACHE_NAME=7.10.3
18+ - env: CACHE_NAME=7.10.3 STACK_YAML=stack.ghc7.10.yaml GHC_VERSION=7.10.3
1919 compiler: ": #stack 7.10.3"
2020 addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
2121
22− - env: GHCVER=8.0.2 CACHE_NAME=8.0.2
22+ - env: CACHE_NAME=8.0.2 STACK_YAML=stack.yaml GHC_VERSION=8.0.2
2323 compiler: ": #stack 8.0.2"
2424 addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
2525
26− - env: GHCVER=8.2.1 CACHE_NAME=8.2.1 BUILD_BINARY=1
27− compiler: ": #stack 8.2.1"
28− addons: {apt: {packages: [ghc-8.2.1], sources: [hvr-ghc]}}
26+ - env: CACHE_NAME=osx-7.10.3 STACK_YAML=stack.ghc7.10.yaml
27+ os: osx
28+ osx_image: xcode6.4
29+ compiler: ": #stack 7.10.3"
2930
30− - env: GHCVER=8.0.2 CACHE_NAME=8.0.2-osx BUILD_BINARY=1
31+ - env: CACHE_NAME=osx-8.0.2 STACK_YAML=stack.yaml
3132 os: osx
3233 compiler: ": #stack 8.0.2"
3334
34−
35−# - env: GHCVER=8.2.1 CACHE_NAME=8.2.1-osx BUILD_BINARY=1
36−# os: osx
37−# compiler: ": #stack 8.2.1"
38−# addons: {apt: {packages: [ghc-8.2.1], sources: [hvr-ghc]}}
39−
4035install:
4136 - unset CC
42− - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:$PATH
37+ - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
4338 - ./.travis/install-ghr.sh
4439 - ./.travis/install-stack.sh
4540
4641# Here starts the actual work to be performed for the package under test;
4742# any command which exits with a non-zero exit code causes the build to fail.
4843script:
49− - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
50− - stack --no-terminal --system-ghc build
51− - stack --no-terminal --system-ghc test
52− - stack --no-terminal --system-ghc haddock
53−
54−#after_success:
55−# - |
56−# # Build and ship binary
57−# ./.travis/attach-binary.sh
44+ - GHC_OPTIONS=""
45+ - |
46+ set -ex
47+ # Run tests
48+ if [ "$(uname)" = "Darwin" ]; then
49+ stack --install-ghc --no-terminal test --ghc-options="$GHC_OPTIONS"
50+ else
51+ stack --no-install-ghc --system-ghc --no-terminal test --ghc-options="$GHC_OPTIONS"
52+ fi
53+ set +ex
54+
55+after_success:
56+ - |
57+ # Build and ship binary
58+ ./.travis/attach-binary.sh
5859
5960# EOF
.travis/install-stack.sh−2
@@ -25,5 +25,3 @@ if [ "$(uname)" = "Darwin" ]; then
2525else
2626 travis_retry fetch_stack_linux
2727fi
28−
29−travis_retry stack --no-terminal setup;
test/Relation/StaticOptimizer.hs+4−4
@@ -124,10 +124,10 @@ testPushDownRestrictionPredicate :: Test
124124testPushDownRestrictionPredicate = TestCase $ do
125125 -- (s union relation{tuple{city "Boston", s# "S6", sname "Stevens", status 50}}) where status = 30 == (s where status=30) union (relation{tuple{city "Boston", s# "S6", sname "Stevens", status 50}} where status=30)
126126 let rvs = RelationVariable "s" ()
127− relationsOrError = do
128− stevens <- mkRelationFromList (attributes suppliersRel) [[TextAtom "S6", TextAtom "Stevens", IntegerAtom 50, TextAtom "Boston"]]
129− let expr1 = Restrict status30 (Union rvs (ExistingRelation stevens))
130− status30 = AttributeEqualityPredicate "status" (NakedAtomExpr (IntAtom 30))
127+ stevens <- case mkRelationFromList (attributes suppliersRel) [
128+ [TextAtom "S6", TextAtom "Stevens", IntegerAtom 50, TextAtom "Boston"]] of
129+ Left err -> assertFailure ("stevens relation: " ++ show err) >> pure relationTrue
130+ Right rel -> pure rel
131131
132132 expectedExpr1 = Union (Restrict status30 rvs) (Restrict status30 (ExistingRelation stevens))
133133 pure $ (expectedExpr1, (applyStaticRestrictionPushdown expr1))