From 3e7d6741e74fc170354794f99300928a40f877e1 Mon Sep 17 00:00:00 2001
From: Michael Sloan <mgsloan@gmail.com>
Date: Fri, 31 Jul 2015 18:56:10 -0700
Subject: [PATCH] Fixes for travis

---
 .travis.yml                                 | 52 +++++++--------------
 ide-backend-server/ide-backend-server.cabal |  2 +-
 ide-backend/ide-backend.cabal               |  5 +-
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a69ed1..b47c830 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,47 +1,29 @@
 matrix:
   include:
-  - env: GHCVER=7.8.4 STACK_YAML=stack-7.8.yaml
-    addons:
-      apt:
-        sources:
-        - hvr-ghc
-        packages:
-        - ghc-7.8.4
-  - env: GHCVER=7.10.1 STACK_YAML=stack.yaml
-    addons:
-      apt:
-        sources:
-        - hvr-ghc
-        packages:
-        - ghc-7.10.1
-  - env: GHCVER=7.10.2 STACK_YAML=stack.yaml
-    addons:
-      apt:
-        sources:
-        - hvr-ghc
-        packages:
-        - ghc-7.10.2
-  - env: GHCVER=head STACK_YAML=stack.yaml
-    addons:
-      apt:
-        sources:
-        - hvr-ghc
-        packages:
-        - ghc-head
-  allow_failures:
-    - env: GHCVER=head STACK_YAML=stack.yaml
+    - env: GHCVER=7.8.4 CABALVER=1.18 STACK_YAML=stack-7.8.yaml
+    - env: GHCVER=7.10.1 CABALVER=1.22 STACK_YAML=stack.yaml
+    - env: GHCVER=7.10.2 CABALVER=1.22 STACK_YAML=stack.yaml
+
+# Disabled until haddock-api supports it
+#    - env: GHCVER=head CABALVER=1.22 STACK_YAML=stack.yaml
+#  allow_failures:
+#    - env: GHCVER=head STACK_YAML=stack.yaml
 
 before_install:
+  # ghc
+  - 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
   # stack
   - mkdir -p ~/.local/bin
-  - export PATH=~/.local/bin:/opt/ghc/$GHCVER/bin:$PATH
+  - export PATH=~/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
   - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v0.1.2.0/stack-0.1.2.0-x86_64-linux.gz | gunzip > ~/.local/bin/stack
   - chmod a+x ~/.local/bin/stack
 
 install:
-  - ./travis_long stack --no-terminal --skip-ghc-check setup
-  - ./travis_long stack --no-terminal --skip-ghc-check test --only-snapshot
+  - ./travis_long stack --no-terminal --skip-ghc-check test --only-snapshot -j1
 
 script:
-  - ./travis_long stack --no-terminal --skip-ghc-check build ide-backend-server
-  - ./travis_long stack --no-terminal --skip-ghc-check test
+  - ./travis_long stack --no-terminal --skip-ghc-check build
+  - ./travis_long stack --no-terminal --skip-ghc-check test ide-backend:TestSuite --test-arguments "-j2"
+  - ./travis_long stack --no-terminal --skip-ghc-check test ide-backend:rpc-server
diff --git a/ide-backend-server/ide-backend-server.cabal b/ide-backend-server/ide-backend-server.cabal
index e7cf63b..acede3b 100644
--- a/ide-backend-server/ide-backend-server.cabal
+++ b/ide-backend-server/ide-backend-server.cabal
@@ -40,7 +40,7 @@ executable ide-backend-server
                       Posix
                       RTS
   build-depends:      base < 10,
-                      ghc                  == 7.4.* || == 7.8.* || == 7.10.*,
+                      ghc                  == 7.4.* || == 7.8.* || == 7.10.* || == 7.11.*,
                       containers           >= 0.4.1   && < 1,
                       bytestring           >= 0.9.2   && < 1,
                       data-accessor        >= 0.2     && < 0.3,
diff --git a/ide-backend/ide-backend.cabal b/ide-backend/ide-backend.cabal
index 6025c74..8c7fe1b 100644
--- a/ide-backend/ide-backend.cabal
+++ b/ide-backend/ide-backend.cabal
@@ -174,7 +174,10 @@ test-suite TestSuite
                       random,
                       Cabal-ide-backend,
                       containers,
-                      deepseq
+                      deepseq,
+                      -- Dependencies of test suite at runtime
+                      parallel,
+                      monads-tf
   default-language:   Haskell2010
   ghc-options:        -Wall
                       -threaded