summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2015-08-18 12:15:15 +0100
committerWill Thompson <will@willthompson.co.uk>2015-08-18 12:15:15 +0100
commit0328a9024234c8fab001726786c09b5f9b36192e (patch)
tree6e9222dd924d00cb622c7ac8cb306419d032d5c3
parentf04933d41fda1241f12fa13db7ccbb35e45ca035 (diff)
travis: more test woes
-rw-r--r--.travis.yml2
-rwxr-xr-xmake_travis_yml.hs4
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 1d67af2..8b3e518 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ script:
- if [ -f configure.ac ]; then autoreconf -i; fi
- cabal configure --enable-tests --enable-benchmarks -v2 # -v2 provides useful information for debugging
- cabal build # this builds all libraries and executables (including tests/benchmarks)
- - cabal test -j1 # TODO: -j1 to attempt to work around Cabal-the-library version mismatch
+ - ./dist/setup/setup test
- cabal check
- cabal sdist # tests that a source-distribution can be generated
diff --git a/make_travis_yml.hs b/make_travis_yml.hs
index bb21180..551cbd5 100755
--- a/make_travis_yml.hs
+++ b/make_travis_yml.hs
@@ -170,7 +170,9 @@ genTravisFromCabalFile fn xpkgs = do
, " - if [ -f configure.ac ]; then autoreconf -i; fi"
, " - cabal configure --enable-tests --enable-benchmarks -v2 # -v2 provides useful information for debugging"
, " - cabal build # this builds all libraries and executables (including tests/benchmarks)"
- , " - cabal test -j1 # TODO: -j1 to attempt to work around Cabal-the-library version mismatch"
+ -- FIXME
+ -- , " - cabal test"
+ , " - ./dist/setup/setup test"
, " - cabal check"
, " - cabal sdist # tests that a source-distribution can be generated"
, ""