Cleanup errors and logging a bit

test/Main.hs

@@ -4,6 +4,7 @@ import Dir
 
 import Control.Exception as E
 import Control.Monad (void)
+import Data.List
 import Language.Haskell.GhcMod (debugInfo)
 import System.Process
 import Test.Hspec
@@ -11,20 +12,35 @@ import TestUtils
 
 main :: IO ()
 main = do
-  let sandboxes = [ "test/data", "test/data/check-packageid"
+  let sandboxes = [ "test/data/cabal-project"
+                  , "test/data/check-packageid"
                   , "test/data/duplicate-pkgver/"
                   , "test/data/broken-cabal/"
                   ]
       genSandboxCfg dir = withDirectory dir $ \cwdir -> do
          system ("sed 's|@CWD@|" ++ cwdir ++ "|g' cabal.sandbox.config.in > cabal.sandbox.config")
       pkgDirs =
-        [ "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d"
+        [ "test/data/cabal-project/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d"
         , "test/data/check-packageid/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d"
         , "test/data/duplicate-pkgver/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d"]
       genGhcPkgCache dir = system $ "ghc-pkg recache --force -f" ++ dir
+
   genSandboxCfg `mapM_` sandboxes
   genGhcPkgCache `mapM_` pkgDirs
-  void $ system "find test \\( -name setup-config -o -name ghc-mod.cache \\) -exec rm {} \\;"
+
+  let caches = [ "setup-config"
+               , "setup-config.ghc-mod.cabal-ghc-options"
+               , "setup-config.ghc-mod.cabal-helper.ghc-options"
+               , "setup-config.ghc-mod.cabal-helper"
+               , "ghc-mod.cache"
+               ]
+      cachesFindExp :: String
+      cachesFindExp = unwords $ intersperse "-o " $ map ("-name "++) caches
+
+      cleanCmd = "find test \\( "++ cachesFindExp ++" \\) -exec rm {} \\;"
+
+  print cleanCmd
+  void $ system cleanCmd
   void $ system "cabal --version"
   putStrLn $ "ghc-mod was built with Cabal version " ++ VERSION_Cabal
   void $ system "ghc --version"