travis: more test woes

wjt · Aug 18, 2015 · 0328a90 · 0328a90
1 parent f04933d
commit 0328a90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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"
         , ""