Commit 4dc416c2 authored by Andrew Gibiansky's avatar Andrew Gibiansky

Travis latest (no more formatting, set -e)

parent faa8ff0d
# Test against different stack LTS versions. # Test against different stack LTS versions.
env: env:
- DISPLAY=true FORMATTING=true RESOLVER=lts-6.2 # Most recent GHC 7.10 LTS - DISPLAY=true RESOLVER=lts-6.2 # Most recent GHC 7.10 LTS
- DISPLAY=false FORMATTING=false RESOLVER=lts-2.22 # Last GHC 7.8 LTS - DISPLAY=false RESOLVER=lts-2.22 # Last GHC 7.8 LTS
# Choose a lightweight base image; we provide our own build tools. # Choose a lightweight base image; we provide our own build tools.
language: c language: c
...@@ -24,9 +24,10 @@ cache: ...@@ -24,9 +24,10 @@ cache:
addons: addons:
apt: apt:
packages: packages:
- libmagic-dev - libmagic-dev # magic
- libgmp-dev - libgmp-dev # ghc
- python3 - libblas-dev # hmatrix
- liblapack-dev # hmatrix
before_install: before_install:
# Download and unpack the stack executable # Download and unpack the stack executable
...@@ -55,14 +56,11 @@ install: ...@@ -55,14 +56,11 @@ install:
- stack setup --resolver=$RESOLVER - stack setup --resolver=$RESOLVER
- stack build --dependencies-only --resolver=$RESOLVER - stack build --dependencies-only --resolver=$RESOLVER
# For verify_formatting.py
- if $FORMATTING; then stack install hindent; fi
script: script:
- export LD_LIBRARY_PATH=$HOME/zeromq/lib - export LD_LIBRARY_PATH=$HOME/zeromq/lib
- stack test --resolver=$RESOLVER - stack test --resolver=$RESOLVER
- if $FORMATTING; then ./verify_formatting.py; fi
- | - |
set -e
if $DISPLAY; then if $DISPLAY; then
TOP=$(pwd) TOP=$(pwd)
for PACKAGE in ihaskell-display/*; do for PACKAGE in ihaskell-display/*; do
...@@ -71,3 +69,4 @@ script: ...@@ -71,3 +69,4 @@ script:
cd "$TOP"; cd "$TOP";
done done
fi fi
...@@ -209,10 +209,11 @@ initializeImports = do ...@@ -209,10 +209,11 @@ initializeImports = do
let idString = packageIdString' dflags (packageConfigId dep) let idString = packageIdString' dflags (packageConfigId dep)
guard (iHaskellPkgName `isPrefixOf` idString) guard (iHaskellPkgName `isPrefixOf` idString)
displayPkgs = [pkgName | pkgName <- packageNames displayPkgs = [ pkgName
| pkgName <- packageNames
, Just (x:_) <- [stripPrefix initStr pkgName] , Just (x:_) <- [stripPrefix initStr pkgName]
, pkgName `notElem` broken , pkgName `notElem` broken
, isAlpha x] , isAlpha x ]
hasIHaskellPackage = not $ null $ filter (== iHaskellPkgName) packageNames hasIHaskellPackage = not $ null $ filter (== iHaskellPkgName) packageNames
...@@ -1222,7 +1223,8 @@ evalStatementOrIO publish state cmd = do ...@@ -1222,7 +1223,8 @@ evalStatementOrIO publish state cmd = do
name == "it" || name == "it" ||
name == "it" ++ show (getExecutionCounter state) name == "it" ++ show (getExecutionCounter state)
nonItNames = filter (not . isItName) allNames nonItNames = filter (not . isItName) allNames
output = [plain printed | not . null $ strip printed] output = [ plain printed
| not . null $ strip printed ]
write state $ "Names: " ++ show allNames write state $ "Names: " ++ show allNames
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment