[commit: packages/directory] improve-tests-for-real: Fix .travis.yml (0974721)

[git at git.haskell.org]

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

On branch  : improve-tests-for-real
Link       : http://ghc.haskell.org/trac/ghc/changeset/09747218f5b464db74dbad318c84a23783fd67b4/directory

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

commit 09747218f5b464db74dbad318c84a23783fd67b4
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Mar 2 18:57:03 2015 -0500

    Fix .travis.yml


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

09747218f5b464db74dbad318c84a23783fd67b4
 .travis.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3848906..a932e54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+language: haskell
 env:
  # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
  # no package for earlier cabal versions in the PPA
@@ -23,11 +24,28 @@ install:
  - cabal install --enable-tests --only-dependencies
  - ghc --version
 
+before_script:
+ - # check if 'streaming' is supported (didn't exist until 1.20)
+   if cabal 2>&1 test --show-details=streaming __dummy |
+      grep >/dev/null 2>&1 "cabal: --show-details flags expects"
+   then streaming=always
+   else streaming=streaming
+   fi
+   export streaming
+
 script:
  - autoreconf -i
  - cabal configure -v2 --enable-tests
  - cabal build
  - cabal check
  - cabal sdist
- - cabal test --show-details=streaming --test-options=WAY=
- - cabal install --force-reinstalls --run-tests dist/*-*.tar.gz
+ - cabal test --show-details=$streaming --test-options=WAY=
+ - |
+   # in the future, use '--run-tests' (didn't exist until 1.20)
+   cabal install --force-reinstalls dist/*-*.tar.gz
+   mkdir install-tmp
+   cd install-tmp
+   tar xzf ../dist/*-*.tar.gz
+   cd *-*
+   cabal configure --enable-tests
+   cabal test