Skip to content
Browse files

Make sure that dependencies for Haskell test suites are installed

Now that we use Cabal 0.14.0, this finally works.
  • Loading branch information...
1 parent 1ea4169 commit 86871ae52df8aa49e85276681458670f6217cd71 @sol sol committed
Showing with 4 additions and 13 deletions.
  1. +2 −11 lib/travis/build/job/test/haskell.rb
  2. +2 −2 spec/build/job/test/haskell_spec.rb
View
13 lib/travis/build/job/test/haskell.rb
@@ -13,20 +13,11 @@ def setup
end
def install
-
- # Ideally we would use:
- #
- # "cabal update && cabal install --only-dependencies --enable-tests"
- #
- # But this does not properly work with cabal-install 0.10.2.
- #
- # http://www.haskell.org/pipermail/cabal-devel/2012-January/008428.html
- #
- "cabal update && cabal install"
+ "cabal update && cabal install --enable-tests"
end
def script
- "cabal configure --enable-tests && cabal build && cabal test"
+ "cabal test"
end
protected
View
4 spec/build/job/test/haskell_spec.rb
@@ -10,14 +10,14 @@
describe 'install' do
it "uses cabal" do
- job.install.should == "cabal update && cabal install"
+ job.install.should == "cabal update && cabal install --enable-tests"
end
end
describe 'script' do
it "uses cabal" do
- job.script.should == "cabal configure --enable-tests && cabal build && cabal test"
+ job.script.should == "cabal test"
end
end
end

0 comments on commit 86871ae

Please sign in to comment.
Something went wrong with that request. Please try again.