git.iko.soy/streamly
on master help sign in
Fix some test failures in the run-ci.sh script
455d683Harendra Kumar
bin/run-ci.sh+5−4
compare with master
unifiedsplit
@@ -24,7 +24,7 @@ GHC_PRIME_VER="8.10"
24JOBS=1
24JOBS=1
25
25
26# Without cabal project file, it will not run any tests
26# Without cabal project file, it will not run any tests
27−# XXX Added DISABLE_SDIST_BUILD because of a cabal issue
27+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
28ghc_prime_dist () {
28ghc_prime_dist () {
29 nix-shell \
29 nix-shell \
30 --argstr compiler "$GHC_PRIME_NIX" \
30 --argstr compiler "$GHC_PRIME_NIX" \
@@ -38,6 +38,7 @@ ghc_prime_dist () {
38}
38}
39
39
40# With cabal.project file, it will run the tests
40# With cabal.project file, it will run the tests
41+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
41ghc_prime_dist_tests () {
42ghc_prime_dist_tests () {
42 nix-shell \
43 nix-shell \
43 --argstr compiler "$GHC_PRIME_NIX" \
44 --argstr compiler "$GHC_PRIME_NIX" \
@@ -47,6 +48,7 @@ ghc_prime_dist_tests () {
47 CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
48 CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
48 CABAL_PROJECT=cabal.project \
49 CABAL_PROJECT=cabal.project \
49 CABAL_DISABLE_DEPS=y \
50 CABAL_DISABLE_DEPS=y \
51+ DISABLE_SDIST_BUILD=y \
50 CABAL_CHECK_RELAX=y"
52 CABAL_CHECK_RELAX=y"
51}
53}
52
54
@@ -113,8 +115,7 @@ ghc_prime_Werror () {
113ghc_prime_doctests () {
115ghc_prime_doctests () {
114 nix-shell \
116 nix-shell \
115 --argstr compiler "$GHC_PRIME_NIX" \
117 --argstr compiler "$GHC_PRIME_NIX" \
116− --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all"
118+ --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all && cabal-docspec --timeout 60"
117− cabal-docspec --timeout 60
118}
119}
119
120
120#------------------------------------------------------------------------------
121#------------------------------------------------------------------------------
@@ -181,7 +182,7 @@ ghc () {
181 --run "\
182 --run "\
182 packcheck.sh cabal-v2 \
183 packcheck.sh cabal-v2 \
183 GHCVER=$2 \
184 GHCVER=$2 \
184− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
185+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
185 CABAL_DISABLE_DEPS=y \
186 CABAL_DISABLE_DEPS=y \
186 CABAL_CHECK_RELAX=y \
187 CABAL_CHECK_RELAX=y \
187 DISABLE_SDIST_BUILD=y \
188 DISABLE_SDIST_BUILD=y \