[commit: packages/process] better-travis: More fixes to Travis (2d050ab)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/process

On branch  : better-travis
Link       : http://ghc.haskell.org/trac/ghc/changeset/2d050ab9e13b7ff0c8b938ba9033f14bb6f0e80a/process

>---------------------------------------------------------------

commit 2d050ab9e13b7ff0c8b938ba9033f14bb6f0e80a
Author: Michael Snoyman <michael at snoyman.com>
Date:   Sun Jan 24 15:23:35 2016 +0200

    More fixes to Travis


>---------------------------------------------------------------

2d050ab9e13b7ff0c8b938ba9033f14bb6f0e80a
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2ae0f6..b26ea9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,6 +72,7 @@ before_install:
 
 install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - autoreconf -i
  - case "$BUILD" in
      stack)
        stack --no-terminal test --only-dependencies;;
@@ -91,14 +92,10 @@ script:
      cabal)
        cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror";
        cabal build;
-       cabal test;
-       cabal check;
+       cabal check || [ "$CABALVER" == "1.16" ];
+       ./dist/build/test/test; # Using cabal test was giving trouble with cabal 1.22
        cabal sdist;
        cabal copy;
-       cd test/integration;
-       true stack setup;
-       true stack test;
-       cd ../..;
        SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
        (cd dist && cabal install --force-reinstalls "$SRC_TGZ");;
    esac