More test suites and Travis integration

Author: snoyberg

.travis.yml

@@ -22,7 +22,7 @@ before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
  - travis_retry sudo apt-get update
  - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER # see note about happy/alex
- - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
  - cabal --version
@@ -39,6 +39,9 @@ script:
  - cabal check
  - cabal sdist   # tests that a source-distribution can be generated
 
+ - cd test/integration
+ - stack test
+
 # Check that the resulting source distribution can be built & installed.
 # If there are no other `.tar.gz` files in `dist`, this can be even simpler:
 # `cabal install --force-reinstalls dist/*-*.tar.gz`

test/integration/Dummy.hs

@@ -0,0 +1,2 @@
+main :: IO ()
+main = return ()

test/integration/Spec.hs

@@ -68,6 +68,7 @@ test :: FilePath -- ^ runghc
      -> String
      -> Spec
 test runghc env' currDir origStackRoot newHome name = it name $ withDir $ \dir -> do
+    removeDirectoryRecursive newHome
     copyStackRoot origStackRoot (newHome </> takeFileName origStackRoot)
     let testDir = currDir </> "tests" </> name
         mainFile = testDir </> "Main.hs"

test/integration/lib/StackTest.hs

@@ -29,3 +29,15 @@ stackErr args = do
     if ec == ExitSuccess
         then error "stack was supposed to fail, but didn't"
         else return ()
+
+doesNotExist :: FilePath -> IO ()
+doesNotExist fp = do
+    putStrLn $ "doesNotExist " ++ fp
+    isFile <- doesFileExist fp
+    if isFile
+        then error $ "File exists: " ++ fp
+        else do
+            isDir <- doesDirectoryExist fp
+            if isDir
+                then error $ "Directory exists: " ++ fp
+                else return ()

test/integration/stack-integration-tests.cabal

@@ -11,7 +11,15 @@ build-type:          Simple
 cabal-version:       >=1.10
 homepage:            https://github.com/commercialhaskell/stack
 
-executable stack-integration-tests
+-- This is only present because cabal won't allow a test suite without a
+-- library or executable
+executable stack-integration-dummy
+  main-is:        Dummy.hs
+  build-depends:  base
+  default-language:    Haskell2010
+
+test-suite stack-integration-tests
+  type:           exitcode-stdio-1.0
   main-is:        Spec.hs
 
   build-depends:  base >= 4.7 && < 10

test/integration/tests/basic-install/Main.hs

@@ -0,0 +1,6 @@
+import StackTest
+
+main :: IO ()
+main = do
+    stack ["install", "acme-missiles-0.3"]
+    doesNotExist "stack.yaml"

test/integration/tests/cyclic-test-deps/Main.hs

@@ -0,0 +1,7 @@
+import StackTest
+
+main :: IO ()
+main = do
+    stack ["unpack", "text-1.2.1.1"]
+    stack ["init", "--resolver", "lts-2.9"]
+    stack ["test", "--dry-run"]

test/integration/tests/sanity/Main.hs

@@ -9,3 +9,4 @@ main = do
     stackErr ["command-does-not-exist"]
     stackErr ["unpack", "invalid-package-name-"]
     stackErr ["build"]
+    doesNotExist "stack.yaml"