Merge branch 'wip-fix-test-all-script' into wip-whitespace-comment

scripts/test-all.sh

@@ -26,19 +26,19 @@ readarray -t SOURCES < "$SOURCES_TXT"
 prepare_sandbox () {
     $CABAL sandbox init
     for s in ${SOURCES[@]} ; do
-        (cd "$s" && $CABAL sandbox init --sandbox=../ && $CABAL sandbox add-source .)
+        (cd "$s" && $CABAL sandbox init --sandbox=../.cabal-sandbox/ && $CABAL sandbox add-source .)
     done
+    $CABAL install --enable-tests ${SOURCES[@]}
 }
 
 test_each () {
     for s in ${SOURCES[@]} ; do
         echo "Testing $s..."
-        cd "$s"
+        pushd "$s"
-        $CABAL install --only-dependencies --enable-tests
         $CABAL configure --enable-tests --ghc-options="$GHC_FLAGS"
         $CABAL build
         $CABAL test
-        cd ..
+        popd
     done
 }
 

servant-server/servant-server.cabal

@@ -113,6 +113,8 @@ test-suite doctests
               , servant
               , doctest
               , filemanip
+              , directory
+              , filepath
  type: exitcode-stdio-1.0
  main-is: test/Doctests.hs
  buildable: True

servant-server/test/Doctests.hs

@@ -1,14 +1,18 @@
 module Main where
 
+import           Data.List (isPrefixOf)
+import           System.Directory
+import           System.FilePath
 import           System.FilePath.Find
 import           Test.DocTest
 
 main :: IO ()
 main = do
     files <- find always (extension ==? ".hs") "src"
+    cabalMacrosFile <- getCabalMacrosFile
     doctest $ [ "-isrc"
               , "-optP-include"
-              , "-optPdist/build/autogen/cabal_macros.h"
+              , "-optP" ++ cabalMacrosFile
               , "-XOverloadedStrings"
               , "-XFlexibleInstances"
               , "-XMultiParamTypeClasses"
@@ -16,3 +20,10 @@ main = do
               , "-XTypeOperators"
               ] ++ files
 
+getCabalMacrosFile :: IO FilePath
+getCabalMacrosFile = do
+  contents <- getDirectoryContents "dist"
+  let rest = "build" </> "autogen" </> "cabal_macros.h"
+  return $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
+    [x] -> "dist" </> x </> rest
+    [] -> "dist" </> rest

servant/servant.cabal

@@ -107,6 +107,8 @@ test-suite doctests
               , servant
               , doctest
               , filemanip
+              , directory
+              , filepath
  type: exitcode-stdio-1.0
  main-is: test/Doctests.hs
  buildable: True

servant/test/Doctests.hs

@@ -1,16 +1,27 @@
 module Main where
 
+import           Data.List (isPrefixOf)
+import           System.Directory
+import           System.FilePath
 import           System.FilePath.Find
 import           Test.DocTest
 
 main :: IO ()
 main = do
     files <- find always (extension ==? ".hs") "src"
+    cabalMacrosFile <- getCabalMacrosFile
     doctest $ [ "-isrc"
               , "-optP-include"
-              , "-optPdist/build/autogen/cabal_macros.h"
+              , "-optP" ++ cabalMacrosFile
               , "-XOverloadedStrings"
               , "-XFlexibleInstances"
               , "-XMultiParamTypeClasses"
               ] ++ files
 
+getCabalMacrosFile :: IO FilePath
+getCabalMacrosFile = do
+  contents <- getDirectoryContents "dist"
+  let rest = "build" </> "autogen" </> "cabal_macros.h"
+  return $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
+    [x] -> "dist" </> x </> rest
+    [] -> "dist" </> rest