Integration tests in the main .cabal file

Brought up by @manny-fp. Now running the full test suite is:

    stack test --flag stack:integration-tests

Author: snoyberg

stack.cabal

@@ -30,6 +30,11 @@ extra-source-files:  README.md ChangeLog.md
                      new-template/LICENSE
                      new-template/Setup.hs
 
+flag integration-tests
+  manual: True
+  default: False
+  description: Run the integration test suite
+
 library
   hs-source-dirs:    src/
   ghc-options:       -Wall
@@ -212,6 +217,34 @@ test-suite stack-test
                 , Cabal
   default-language:    Haskell2010
 
+test-suite stack-integration-test
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: test/integration
+  main-is:        Spec.hs
+  ghc-options:    -Wall -threaded -rtsopts -with-rtsopts=-N
+
+  if flag(integration-tests)
+    buildable: True
+  else
+    buildable: False
+
+  build-depends:  base >= 4.7 && < 10
+                , temporary
+                , hspec
+                , process
+                , filepath
+                , directory
+                , text
+                , unix-compat
+                , containers
+                , conduit
+                , conduit-extra
+                , resourcet
+                , async
+                , transformers
+                , bytestring
+  default-language:    Haskell2010
+
 source-repository head
   type:     git
   location: https://github.com/commercialhaskell/stack

test/integration/Dummy.hs

@@ -31,7 +31,7 @@ import           Test.Hspec
 
 main :: IO ()
 main = do
-    currDir <- getCurrentDirectory
+    currDir <- canonicalizePath "test/integration"
 
     let findExe name = do
             mexe <- findExecutable name
@@ -41,7 +41,8 @@ main = do
     runghc <- findExe "runghc"
     stack <- findExe "stack"
 
-    tests <- getDirectoryContents "tests" >>= filterM hasTest
+    let testDir = currDir </> "tests"
+    tests <- getDirectoryContents testDir >>= filterM (hasTest testDir)
 
     envOrig <- getEnvironment
 
@@ -58,8 +59,8 @@ main = do
 
         hspec $ mapM_ (test runghc env' currDir origStackRoot newHome) tests
 
-hasTest :: FilePath -> IO Bool
-hasTest dir = doesFileExist $ "tests" </> dir </> "Main.hs"
+hasTest :: FilePath -> FilePath -> IO Bool
+hasTest root dir = doesFileExist $ root </> dir </> "Main.hs"
 
 test :: FilePath -- ^ runghc
      -> [(String, String)] -- ^ env