Merge pull request haskell#5070 from phadej/enable-hackage-tests

Enable hackage-tests on downstream travis
phadej · Jan 25, 2018 · 7d7916c · 7d7916c
2 parents 2258163 + d5bcc17
commit 7d7916c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/travis/binaries/.travis.yml b/travis/binaries/.travis.yml
@@ -12,7 +12,7 @@ before_install:
  - export PATH=$HOME/bin:$PATH
  - export PATH=$HOME/.cabal/bin:$PATH
  - export PATH=$HOME/.local/bin:$PATH
- - export PATH=/opt/cabal/1.24/bin:$PATH
+ - export PATH=/opt/cabal/2.0/bin:$PATH
  - export PATH=/opt/happy/1.19.5/bin:$PATH
  - export PATH=/opt/alex/3.1.7/bin:$PATH
  - ./travis-install.sh

diff --git a/travis/binaries/travis-test.sh b/travis/binaries/travis-test.sh
@@ -21,9 +21,11 @@ ln -s $TRAVIS_BUILD_DIR $UPSTREAM_BUILD_DIR
 
 # Test we can parse Hackage
 # Note: no $TEST_OPTIONS as this isn't tasty suite
-if [ -f ~/.cabal/config ]; then
+
+# fetch 01-index.tar,
+# `hackage-tests parsec` tries to parse all of cabal files in the index.
+cabal update
 (cd Cabal && timed ./hackage-tests parsec) || exit $?
-fi
 
 if [ "x$CABAL_LIB_ONLY" = "xYES" ]; then
     exit 0;