aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-03-10 09:16:29 +0100
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-03-10 09:17:59 +0100
commit9add418e7699a812e7cf5257680a7550234deb2a (patch)
tree5d518d51ebc49c7bdcb2efdc562308dfc848f3d3
parentcae09e5af6cf31d96662b1b66a63c6a236a8e741 (diff)
parentae5ae4967c423a26b99666dcce441236dd7b9a7b (diff)
Merge PR#468: [travis] Fix GeoCoq and move it to allow fail.
-rw-r--r--.travis.yml4
-rwxr-xr-xdev/ci/ci-geocoq.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 5ed0809a5..678b4af7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ env:
- TEST_TARGET="ci-color"
- TEST_TARGET="ci-compcert"
- TEST_TARGET="ci-coquelicot"
- - TEST_TARGET="ci-cpdt"
- TEST_TARGET="ci-geocoq"
- TEST_TARGET="ci-fiat-crypto"
- TEST_TARGET="ci-fiat-parsers"
@@ -39,13 +38,14 @@ env:
- TEST_TARGET="ci-sf"
- TEST_TARGET="ci-unimath"
# Not ready yet for 8.7
+ # - TEST_TARGET="ci-cpdt"
# - TEST_TARGET="ci-metacoq"
# - TEST_TARGET="ci-tlc"
matrix:
allow_failures:
- - env: TEST_TARGET="ci-cpdt"
+ - env: TEST_TARGET="ci-geocoq"
# Full Coq test-suite with two compilers
# [TODO: use yaml refs and avoid duplication for packages list]
diff --git a/dev/ci/ci-geocoq.sh b/dev/ci/ci-geocoq.sh
index ce870e52b..29667b018 100755
--- a/dev/ci/ci-geocoq.sh
+++ b/dev/ci/ci-geocoq.sh
@@ -12,5 +12,7 @@ git_checkout ${GeoCoq_CI_BRANCH} ${GeoCoq_CI_GITURL} GeoCoq
( cd GeoCoq && \
./configure.sh && \
sed -i.bak '/Ch16_coordinates_with_functions\.v/d' Make && \
+ sed -i.bak '/Elements\/Book_1\.v/d' Make && \
+ sed -i.bak '/Elements\/Book_3\.v/d' Make && \
coq_makefile -f Make -o Makefile && \
make -j ${NJOBS} )