[commit: packages/deepseq] down, master, wip/remove_ghc70_72_cpp: Run tests on Travis (#24) (b01f808)
git at git.haskell.org
git at git.haskell.org
Wed Jul 19 21:59:13 UTC 2017
Repository : ssh://git@git.haskell.org/deepseq
On branches: down,master,wip/remove_ghc70_72_cpp
Link : http://git.haskell.org/packages/deepseq.git/commitdiff/b01f808ea1b7a7d28ef7f5731396de6b73f5f6e6
>---------------------------------------------------------------
commit b01f808ea1b7a7d28ef7f5731396de6b73f5f6e6
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date: Tue Oct 25 13:49:58 2016 -0400
Run tests on Travis (#24)
(except for GHC < 7.4)
>---------------------------------------------------------------
b01f808ea1b7a7d28ef7f5731396de6b73f5f6e6
.travis.yml | 97 +++++++++++++++++++++++++++++++++++------------------------
deepseq.cabal | 3 +-
2 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1ff0ad3..08f7528 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,60 +13,60 @@ before_cache:
matrix:
include:
- - env: CABALVER=1.16 GHCVER=7.0.1
+ - env: CABALVER=1.24 GHCVER=7.0.1
compiler: ": #GHC 7.0.1"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.0.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.0.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.0.2
compiler: ": #GHC 7.0.2"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.0.3
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.0.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.0.3
compiler: ": #GHC 7.0.3"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.3], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.0.4
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.0.3], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.0.4
compiler: ": #GHC 7.0.4"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.2.1
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.0.4], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.2.1
compiler: ": #GHC 7.2.1"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.2.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.2.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.2.2
compiler: ": #GHC 7.2.2"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.4.1
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.2.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.4.1
compiler: ": #GHC 7.4.1"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.4.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.4.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.4.2
compiler: ": #GHC 7.4.2"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.6.1
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.4.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.6.1
compiler: ": #GHC 7.6.1"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.6.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.6.2
compiler: ": #GHC 7.6.2"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.16 GHCVER=7.6.3
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.6.3
compiler: ": #GHC 7.6.3"
- addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.1
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.3], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.8.1
compiler: ": #GHC 7.8.1"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.8.2
compiler: ": #GHC 7.8.2"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.3
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.8.3
compiler: ": #GHC 7.8.3"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.3], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.4
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.3], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.8.4
compiler: ": #GHC 7.8.4"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- - env: CABALVER=1.22 GHCVER=7.10.1
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.4], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.10.1
compiler: ": #GHC 7.10.1"
- addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.22 GHCVER=7.10.2
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.1], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.10.2
compiler: ": #GHC 7.10.2"
- addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.22 GHCVER=7.10.3
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
- addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
@@ -74,6 +74,10 @@ matrix:
before_install:
- unset CC
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - if [ "$GHCVER" != "7.2.1" ];
+ then
+ export TEST_OPTS="--enable-tests --enable-benchmarks";
+ fi
install:
- cabal --version
@@ -85,7 +89,13 @@ install:
fi
- travis_retry cabal update -v
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - cabal install --only-dependencies --dry -v > installplan.txt
+# can't use "cabal install --only-dependencies --enable-tests" due to dep-cycle
+ - if [ -n "$TEST_OPTS" ];
+ then
+ cabal install 'test-framework == 0.8.*' 'test-framework-hunit == 0.3.*' 'HUnit >= 1.2 && < 1.6' --dry -v > installplan.txt;
+ else
+ cabal install --only-dependencies --dry -v > installplan.txt;
+ fi
- sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
# check whether current requested install-plan matches cached package-db snapshot
@@ -99,7 +109,12 @@ install:
echo "cabal build-cache MISS";
rm -rf $HOME/.cabsnap;
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
- cabal install --only-dependencies;
+ if [ -n "$TEST_OPTS" ];
+ then
+ cabal install -j 'test-framework == 0.8.*' 'test-framework-hunit == 0.3.*' 'HUnit >= 1.2 && < 1.6';
+ else
+ cabal install -j --only-dependencies;
+ fi
fi
# snapshot package-db on cache miss
@@ -115,9 +130,13 @@ install:
# any command which exits with a non-zero exit code causes the build to fail.
script:
- if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal configure -v2 # -v2 provides useful information for debugging
+ - cabal configure $TEST_OPTS -v2 # -v2 provides useful information for debugging
- cabal build # this builds all libraries and executables (including tests/benchmarks)
- cabal sdist # tests that a source-distribution can be generated
+ - if [ -n "$TEST_OPTS" ];
+ then
+ cabal test --show-details=always;
+ fi
# Check that the resulting source distribution can be built & installed.
# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
diff --git a/deepseq.cabal b/deepseq.cabal
index 849c7db..146e0a2 100644
--- a/deepseq.cabal
+++ b/deepseq.cabal
@@ -90,7 +90,8 @@ test-suite deepseq-generics-tests
build-depends:
array,
base,
+ ghc-prim,
-- end of packages with inherited version constraints
test-framework == 0.8.*,
test-framework-hunit == 0.3.*,
- HUnit >= 1.2 && < 1.4
+ HUnit >= 1.2 && < 1.6
More information about the ghc-commits
mailing list