aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--haddock-test/haddock-test.cabal2
-rw-r--r--haddock-test/src/Test/Haddock/Config.hs10
-rw-r--r--haddock-test/src/Test/Haddock/Utils.hs7
-rw-r--r--hoogle-test/Main.hs4
-rwxr-xr-xlatex-test/Main.hs4
6 files changed, 25 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 5d82bc96..5410ef42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ TAGS
.cabal-sandbox
cabal.sandbox.config
+
+.stack-work/
diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal
index ef928e78..56dd1845 100644
--- a/haddock-test/haddock-test.cabal
+++ b/haddock-test/haddock-test.cabal
@@ -21,8 +21,8 @@ library
exposed-modules:
Test.Haddock
Test.Haddock.Config
+ Test.Haddock.Utils
Test.Haddock.Xhtml
other-modules:
Test.Haddock.Process
- Test.Haddock.Utils
diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index 50616c7f..988636e4 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -193,7 +193,7 @@ loadConfig ccfg dcfg flags files = do
, baseDependencies ghcPath
]
- let cfgHaddockStdOut = fromMaybe "/dev/null" (flagsHaddockStdOut flags)
+ let cfgHaddockStdOut = fromMaybe defaultStdOut (flagsHaddockStdOut flags)
cfgDiffTool <- if FlagNoDiff `elem` flags
then pure Nothing
@@ -256,6 +256,14 @@ defaultDiffTool =
isAvailable = liftM isJust . findProgramLocation silent
+defaultStdOut :: FilePath
+#ifdef mingw32_HOST_OS
+defaultStdOut = "nul"
+#else
+defaultStdOut = "/dev/null"
+#endif
+
+
processFileArgs :: DirConfig -> [String] -> IO [TestPackage]
processFileArgs dcfg [] =
processFileArgs' dcfg . filter isValidEntry =<< getDirectoryContents srcDir
diff --git a/haddock-test/src/Test/Haddock/Utils.hs b/haddock-test/src/Test/Haddock/Utils.hs
index a947fea1..58408aaf 100644
--- a/haddock-test/src/Test/Haddock/Utils.hs
+++ b/haddock-test/src/Test/Haddock/Utils.hs
@@ -48,3 +48,10 @@ copyFile' :: FilePath -> FilePath -> IO ()
copyFile' old new = do
createDirectoryIfMissing True $ takeDirectory new
copyFile old new
+
+
+crlfToLf :: String -> String
+crlfToLf "" = ""
+crlfToLf ('\r' : '\n' : rest) = '\n' : crlfToLf rest
+crlfToLf ('\r' : rest) = '\n' : crlfToLf rest
+crlfToLf (other : rest) = other : crlfToLf rest
diff --git a/hoogle-test/Main.hs b/hoogle-test/Main.hs
index 59a98fd0..d19ae585 100644
--- a/hoogle-test/Main.hs
+++ b/hoogle-test/Main.hs
@@ -1,10 +1,12 @@
{-# LANGUAGE CPP #-}
+import Data.Function
import System.Environment
import System.FilePath
import Test.Haddock
+import Test.Haddock.Utils
checkConfig :: CheckConfig String
@@ -12,7 +14,7 @@ checkConfig = CheckConfig
{ ccfgRead = Just
, ccfgClean = \_ -> id
, ccfgDump = id
- , ccfgEqual = (==)
+ , ccfgEqual = (==) `on` crlfToLf
}
diff --git a/latex-test/Main.hs b/latex-test/Main.hs
index 5989410b..8d2a4922 100755
--- a/latex-test/Main.hs
+++ b/latex-test/Main.hs
@@ -1,10 +1,12 @@
{-# LANGUAGE CPP #-}
+import Data.Function
import System.Environment
import System.FilePath
import Test.Haddock
+import Test.Haddock.Utils
checkConfig :: CheckConfig String
@@ -12,7 +14,7 @@ checkConfig = CheckConfig
{ ccfgRead = Just
, ccfgClean = \_ -> id
, ccfgDump = id
- , ccfgEqual = (==)
+ , ccfgEqual = (==) `on` crlfToLf
}