Fix test failures on Windows (#564)

* Ignore .stack-work

* Fix for windows: use nul instead of /dev/null

* Fix for windows: canonicalize line separator

* Also normalize osx line endings

.gitignore

@@ -21,3 +21,5 @@ TAGS
 
 .cabal-sandbox
 cabal.sandbox.config
+
+.stack-work/

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

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

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

hoogle-test/Main.hs

 {-# 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
     }
 
 

latex-test/Main.hs

 {-# 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
     }