Skip to content

Commit

Permalink
Issue #254 is resolved by upgrading to ghc 7.8.4.
Browse files Browse the repository at this point in the history
Closes #254.
  • Loading branch information
edsko committed Jan 22, 2015
1 parent d9fa888 commit 3effeea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions TestSuite/TestSuite/Assertions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,6 @@ knownProblems = [
-- errors or just for this particular one (I tried a few but didn't see
-- filepaths in any of them).
("#32", [GHC_7_4])
-- https://github.com/fpco/ide-backend/issues/254
, ("#254", [GHC_7_8])
]

fixme :: IdeSession -> String -> IO () -> IO String
Expand Down
6 changes: 3 additions & 3 deletions TestSuite/TestSuite/Tests/Packages.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ testGroupPackages env = testGroup "Packages" $ [
, stdTest env "Using something from a different package (no \"Loading package\" msg)" test_UseFromDifferentPackage
] ++ docTests env [
stdTest env "Consistency of multiple modules of the same name" test_Consistency
, withOK env "Consistency of multiple modules of the same name: PackageImports" test_Consistency_PackageImports
, stdTest env "Consistency of multiple modules of the same name: PackageImports" test_Consistency_PackageImports
, stdTest env "Module name visible from 2 packages --- picked from monads-tf" test_ModuleIn2Pkgs_1
]

Expand Down Expand Up @@ -254,7 +254,7 @@ test_Consistency env = withAvailableSession env $ \sess -> do
assertIdInfo sess "Bar" (3, 7, 3, 15) "putStrLn" VarName "String -> IO ()" "base-4.5.1.0:System.IO" "<no location info>" "base-4.5.1.0:System.IO" "imported from base-4.5.1.0:Prelude at Bar.hs@1:8-1:11"
-- would fail: assertIdInfo gif "Baz" (6, 8, 6, 9) "foobar" VarName "IO ()" "main:Control.Parallel" "Control/Parallel.hs@7:1-7:7" "" "imported from main:Control/Parallel at Baz.hs@3:1-3:24"

test_Consistency_PackageImports :: TestSuiteEnv -> IO String
test_Consistency_PackageImports :: TestSuiteEnv -> Assertion
test_Consistency_PackageImports env = withAvailableSession env $ \sess -> do
let cb = \_ -> return ()
update = flip (updateSession sess) cb
Expand Down Expand Up @@ -288,7 +288,7 @@ test_Consistency_PackageImports env = withAvailableSession env $ \sess -> do

assertNoErrors sess
assertIdInfo sess "Bar" (3, 7, 3, 15) "putStrLn" VarName "String -> IO ()" "base-4.5.1.0:System.IO" "<no location info>" "base-4.5.1.0:System.IO" "imported from base-4.5.1.0:Prelude at Bar.hs@1:8-1:11"
fixme sess "#254" $ assertIdInfo sess "Baz" (7, 7, 7, 10) "par" VarName "a1 -> b1 -> b1" "parallel-X.Y.Z:Control.Parallel" "<no location info>" "parallel-X.Y.Z:Control.Parallel" "imported from parallel-X.Y.Z:Control.Parallel at Baz.hs@4:1-4:35"
assertIdInfo sess "Baz" (7, 7, 7, 10) "par" VarName "a1 -> b1 -> b1" "parallel-X.Y.Z:Control.Parallel" "<no location info>" "parallel-X.Y.Z:Control.Parallel" "imported from parallel-X.Y.Z:Control.Parallel at Baz.hs@4:1-4:35"

test_ModuleIn2Pkgs_1 :: TestSuiteEnv -> Assertion
test_ModuleIn2Pkgs_1 env = withAvailableSession' env (withGhcOpts packageOpts) $ \session -> do
Expand Down
6 changes: 3 additions & 3 deletions TestSuite/TestSuite/Tests/TypeInformation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ testGroupTypeInformation env = testGroup "Type Information" $ [
, stdTest env "Simple ADTs" testSimpleADTs
, stdTest env "Polymorphism" testPolymorphism
, stdTest env "Multiple modules" testMultipleModules
, withOK env "External packages, type sigs, scoped type vars, kind sigs" testExternalPkgs
, stdTest env "External packages, type sigs, scoped type vars, kind sigs" testExternalPkgs
, stdTest env "Reusing type variables" testReusingTypeVariables
, stdTest env "Qualified imports" testQualifiedImports
, stdTest env "Imprecise source spans" testImpreciseSourceSpans
Expand Down Expand Up @@ -205,7 +205,7 @@ testMultipleModules env = withAvailableSession env $ \session -> do
, "foo = MkT"
])

testExternalPkgs :: TestSuiteEnv -> IO String
testExternalPkgs :: TestSuiteEnv -> Assertion
testExternalPkgs env = withAvailableSession' env (withGhcOpts opts) $ \session -> do
updateSessionD session upd 2
assertNoErrors session
Expand Down Expand Up @@ -248,7 +248,7 @@ testExternalPkgs env = withAvailableSession' env (withGhcOpts opts) $ \session -
assertIdInfo session "A" (14,1,14,2) "i" VarName "t a -> t a" "main:A" "A.hs@14:1-14:2" "" "binding occurrence"
assertIdInfo session "A" (14,3,14,4) "x" VarName "t a" "main:A" "A.hs@14:3-14:4" "" "binding occurrence"
assertIdInfo session "A" (14,7,14,8) "x" VarName "t a" "main:A" "A.hs@14:3-14:4" "" "defined locally"
fixme session "#254" $ assertIdInfo session "A" (3,10,3,16) "pseq" VarName "a -> b -> b" "parallel-3.2.0.3:Control.Parallel" "<no location info>" "parallel-3.2.0.3:Control.Parallel" "imported from parallel-3.2.0.3:Control.Parallel at A.hs@2:1-2:24"
assertIdInfo session "A" (3,10,3,16) "pseq" VarName "a -> b -> b" "parallel-3.2.0.3:Control.Parallel" "<no location info>" "parallel-3.2.0.3:Control.Parallel" "imported from parallel-3.2.0.3:Control.Parallel at A.hs@2:1-2:24"
where
opts = [ "-XScopedTypeVariables"
, "-XKindSignatures"
Expand Down

0 comments on commit 3effeea

Please sign in to comment.