Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed name collision in Setup.lhs

  • Loading branch information...
commit 3d0d9edb9aec0223555c452929b7610fadecb462 1 parent d1af2c3
@ekmett authored
Showing with 7 additions and 4 deletions.
  1. +3 −0  CHANGELOG.markdown
  2. +3 −3 Setup.lhs
  3. +1 −1  speculation.cabal
View
3  CHANGELOG.markdown
@@ -1,3 +1,6 @@
+/1.2.0.2/
+ * Fixed name collision with the new Distribution.Simple.testHook in Setup.lhs
+
/1.2.0.1/
* Weakened dependencies
View
6 Setup.lhs
@@ -30,7 +30,7 @@ main :: IO ()
main = defaultMainWithHooks hooks
hooks :: UserHooks
-hooks = simpleUserHooks { runTests = testHook }
+hooks = simpleUserHooks { runTests = runMyTests }
findHPC :: LocalBuildInfo -> IO FilePath
findHPC lbi = do
@@ -48,8 +48,8 @@ testSpeculation dflt f pd =
| exe <- executables pd
, exeName exe == "test-speculation" ]
-testHook :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
-testHook args0 _unknown pd lbi = do
+runMyTests :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
+runMyTests args0 _unknown pd lbi = do
let args = if null args0 then [] else "-t" : args0
-- dir <- getWorkingDirectory
let testDir = buildDir lbi </> "test-speculation"
View
2  speculation.cabal
@@ -1,5 +1,5 @@
name: speculation
-version: 1.2.0.1
+version: 1.2.0.2
license: BSD3
license-file: LICENSE
author: Edward A. Kmett
Please sign in to comment.
Something went wrong with that request. Please try again.