[commit: packages/directory] master: Remove workaround for haskell/cabal#1938, which has already been fixed (6e67318)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6e6731893ff52489320becbdd11e87c3759f3682/directory

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

commit 6e6731893ff52489320becbdd11e87c3759f3682
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Sep 1 23:50:33 2015 -0400

    Remove workaround for haskell/cabal#1938, which has already been fixed


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

6e6731893ff52489320becbdd11e87c3759f3682
 .travis.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b9766f..df901c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,18 +37,6 @@ before_script:
      else streaming=streaming
      fi
      export streaming
- - | # skip cabal test on HEAD due to this bug:
-     # https://github.com/haskell/cabal/issues/1938
-     # this is fine as the test will be run during installation anyway
-     if [ "$CABALVER" = head ]
-     then def_cabal_test='cabal_test() {
-          echo "warning: cabal test skipped due to Cabal bug #1938"
-     }'
-     else def_cabal_test='cabal_test() {
-          cabal test "$@"
-     }'
-     fi
-     export def_cabal_test
  - | # check if '--run-tests' is supported (didn't exist until 1.20);
      # tests must be run prior to install as packages may be broken by install
      if cabal 2>&1 install --run-tests __dummy |
@@ -77,7 +65,6 @@ script:
  - cabal build
  - cabal check
  - cabal sdist
- - eval "$def_cabal_test" &&
-   cabal_test --show-details=$streaming --test-option="+RTS -N2"
+ - cabal test --show-details=$streaming --test-option="+RTS -N2"
  - eval "$def_cabal_install_run_tests" &&
    cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz