Use cabal-doctest

Author: phadej

Setup.lhs

@@ -1,6 +1,20 @@
 \begin{code}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+module Main (main) where
+
+#ifndef MIN_VERSION_cabal_doctest
+#define MIN_VERSION_cabal_doctest(x,y,z) 0
+#endif
+
+import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
+
+#if MIN_VERSION_cabal_doctest(1,0,0)
+import Distribution.Extra.Doctest ( generateBuildModule )
+#else
+
+-- Otherwise we provide a shim
+
 #ifndef MIN_VERSION_Cabal
 #define MIN_VERSION_Cabal(x,y,z) 0
 #endif
@@ -10,14 +24,13 @@
 #if MIN_VERSION_Cabal(1,24,0)
 #define InstalledPackageId UnitId
 #endif
-module Main (main) where
 
 import Control.Monad ( when )
 import Data.List ( nub )
+import Data.String ( fromString )
 import Distribution.Package ( InstalledPackageId )
 import Distribution.Package ( PackageId, Package (..), packageVersion )
 import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..))
-import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
 import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose )
 import Distribution.Simple.BuildPaths ( autogenModulesDir )
 import Distribution.Simple.Setup ( BuildFlags(buildDistPref, buildVerbosity), fromFlag)
@@ -43,15 +56,8 @@ makeAbsolute p | isAbsolute p = return p
     return $ cwd </> p
 #endif
 
-main :: IO ()
-main = defaultMainWithHooks simpleUserHooks
-  { buildHook = \pkg lbi hooks flags -> do
-     generateBuildModule flags pkg lbi
-     buildHook simpleUserHooks pkg lbi hooks flags
-  }
-
-generateBuildModule :: BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-generateBuildModule flags pkg lbi = do
+generateBuildModule :: String -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+generateBuildModule testsuiteName flags pkg lbi = do
   let verbosity = fromFlag (buildVerbosity flags)
   let distPref = fromFlag (buildDistPref flags)
 
@@ -83,7 +89,7 @@ generateBuildModule flags pkg lbi = do
             [ "-include", libAutogenDir ++ "/cabal_macros.h" ]
             ++ cppOptions libBI
 
-    withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == "doctests") $ do
+    withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == fromString testsuiteName) $ do
 
       -- get and create autogen dir
 #if MIN_VERSION_Cabal(1,25,0)
@@ -160,5 +166,13 @@ generateBuildModule flags pkg lbi = do
 
 testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]
 testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys
+#endif
+
+main :: IO ()
+main = defaultMainWithHooks simpleUserHooks
+  { buildHook = \pkg lbi hooks flags -> do
+     generateBuildModule "doctests" flags pkg lbi
+     buildHook simpleUserHooks pkg lbi hooks flags
+  }
 
 \end{code}

servant-swagger.cabal

@@ -33,6 +33,12 @@ source-repository head
   type:     git
   location: https://github.com/haskell-servant/servant-swagger.git
 
+custom-setup
+  setup-depends:
+    base >=4.7 && <4.10,
+    Cabal >= 1.18 && <2.0,
+    cabal-doctest >=1 && <1.1
+
 library
   ghc-options:         -Wall
   exposed-modules:
@@ -68,10 +74,9 @@ test-suite doctests
   build-depends:
     base,
     directory >= 1.0,
-    doctest >= 0.11 && <0.12,
+    doctest >= 0.11.1 && <0.12,
     servant >= 0.10,
     QuickCheck,
-    lens-aeson,
     filepath
   default-language: Haskell2010
   hs-source-dirs:   test

test/doctests.hsc

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Main (doctests)
@@ -16,42 +14,11 @@
 module Main where
 
 import Build_doctests (flags, pkgs, module_sources)
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative
-#endif
 import Data.Foldable (traverse_)
 import Test.DocTest
 
-##if defined(mingw32_HOST_OS)
-##if defined(i386_HOST_ARCH)
-##define USE_CP
-import Control.Applicative
-import Control.Exception
-import Foreign.C.Types
-foreign import stdcall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool
-foreign import stdcall "windows.h GetConsoleCP" c_GetConsoleCP :: IO CUInt
-##elif defined(x86_64_HOST_ARCH)
-##define USE_CP
-import Control.Applicative
-import Control.Exception
-import Foreign.C.Types
-foreign import ccall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool
-foreign import ccall "windows.h GetConsoleCP" c_GetConsoleCP :: IO CUInt
-##endif
-##endif
-
--- | Run in a modified codepage where we can print UTF-8 values on Windows.
-withUnicode :: IO a -> IO a
-##ifdef USE_CP
-withUnicode m = do
-  cp <- c_GetConsoleCP
-  (c_SetConsoleCP 65001 >> m) `finally` c_SetConsoleCP cp
-##else
-withUnicode m = m
-##endif
-
 main :: IO ()
-main = withUnicode $ do
+main = do
     traverse_ putStrLn args
     doctest args
   where