Skip to content

Commit

Permalink
Remove workaround for haskell/cabal#1938, which has already been fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Rufflewind committed Sep 22, 2015
1 parent 7ca0ab3 commit 08f9f74
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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

0 comments on commit 08f9f74

Please sign in to comment.