From 955223a2a8f8b1cd4de379681954eb31a21d654c Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Tue, 3 Sep 2013 11:49:35 +0900 Subject: [PATCH] module name change. --- ghc-mod.cabal | 2 +- test/CheckSpec.hs | 3 ++- test/CradleSpec.hs | 3 ++- test/DebugSpec.hs | 3 ++- test/{Expectation.hs => Dir.hs} | 2 +- test/InfoSpec.hs | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-) rename test/{Expectation.hs => Dir.hs} (95%) diff --git a/ghc-mod.cabal b/ghc-mod.cabal index 7155b21..65be657 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -90,7 +90,7 @@ Test-Suite spec Main-Is: Spec.hs Hs-Source-Dirs: test, . Type: exitcode-stdio-1.0 - Other-Modules: Expectation + Other-Modules: Dir BrowseSpec CabalApiSpec CheckSpec diff --git a/test/CheckSpec.hs b/test/CheckSpec.hs index b0aeb17..02e0378 100644 --- a/test/CheckSpec.hs +++ b/test/CheckSpec.hs @@ -1,11 +1,12 @@ module CheckSpec where import Data.List (isSuffixOf, isInfixOf, isPrefixOf) -import Expectation import Language.Haskell.GhcMod import System.FilePath import Test.Hspec +import Dir + spec :: Spec spec = do describe "checkSyntax" $ do diff --git a/test/CradleSpec.hs b/test/CradleSpec.hs index 647d576..e0c269e 100644 --- a/test/CradleSpec.hs +++ b/test/CradleSpec.hs @@ -2,12 +2,13 @@ module CradleSpec where import Control.Applicative import Data.List (isPrefixOf) -import Expectation import Language.Haskell.GhcMod import System.Directory (canonicalizePath) import System.FilePath (addTrailingPathSeparator, ()) import Test.Hspec +import Dir + spec :: Spec spec = do describe "findCradle" $ do diff --git a/test/DebugSpec.hs b/test/DebugSpec.hs index 090028a..aa448e2 100644 --- a/test/DebugSpec.hs +++ b/test/DebugSpec.hs @@ -1,9 +1,10 @@ module DebugSpec where -import Expectation import Language.Haskell.GhcMod import Test.Hspec +import Dir + checkFast :: String -> String -> IO () checkFast file ans = withDirectory_ "test/data" $ do (strVer,_) <- getGHCVersion diff --git a/test/Expectation.hs b/test/Dir.hs similarity index 95% rename from test/Expectation.hs rename to test/Dir.hs index 01fea07..c64ed5b 100644 --- a/test/Expectation.hs +++ b/test/Dir.hs @@ -1,4 +1,4 @@ -module Expectation where +module Dir where import System.Directory import Control.Exception as E diff --git a/test/InfoSpec.hs b/test/InfoSpec.hs index ebef607..bce686c 100644 --- a/test/InfoSpec.hs +++ b/test/InfoSpec.hs @@ -1,12 +1,13 @@ module InfoSpec where import Data.List (isPrefixOf) -import Expectation import Language.Haskell.GhcMod import System.Exit import System.Process import Test.Hspec +import Dir + spec :: Spec spec = do describe "typeExpr" $ do