From 781f98152ef8cf31cfaa3ed4f986478b39525108 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 18:23:31 -0800 Subject: [PATCH 01/16] Initial attempt at fixing cover --- .travis.yml | 38 ++++++++++++++++++++------------------ info.rkt | 47 ++--------------------------------------------- 2 files changed, 22 insertions(+), 63 deletions(-) diff --git a/.travis.yml b/.travis.yml index d83b30f..fb58183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,33 +3,35 @@ sudo: false env: global: - RACKET_DIR=~/racket + - VERSION_TO_COVER="6.3" matrix: - - RACKET_VERSION=6.1.1 - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.1.1/catalog/" - - RACKET_VERSION=6.2 - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.2/catalog/" - - RACKET_VERSION=6.2.1 - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.2.1/catalog/" - - RACKET_VERSION=6.3 - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.3/catalog/" - - RACKET_VERSION=HEAD - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.3/catalog/" + - RACKET_VERSION="6.1.1" + CATALOG_VERSION="6.1.1" + - RACKET_VERSION="6.2" + CATALOG_VERSION="6.2" + - RACKET_VERSION="6.2.1" + CATALOG_VERSION="6.2.1" + - RACKET_VERSION="6.3" + CATALOG_VERSION="6.3" + - RACKET_VERSION="HEAD" + CATALOG_VERSION="6.3" matrix: allow_failures: - - env: RACKET_VERSION=HEAD - VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/6.3/catalog/" + - env: RACKET_VERSION="HEAD" + CATALOG_VERSION="6.3" before_install: - git clone https://github.com/greghendershott/travis-racket.git ../travis-racket - cat ../travis-racket/install-racket.sh | bash - export PATH="${RACKET_DIR}/bin:${PATH}" + - export VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/${CATALOG_VERSION}/catalog/" + - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org + - raco pkg install cover + - raco pkg install cover-coveralls install: - - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org - - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR # install dependencies + - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR script: - - raco test $TRAVIS_BUILD_DIR # run tests. you wrote tests, right? - -after_success: - - raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage . # generate coverage information for coveralls + - raco test $TRAVIS_BUILD_DIR + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage .; fi diff --git a/info.rkt b/info.rkt index 16f794a..d6af6c4 100644 --- a/info.rkt +++ b/info.rkt @@ -23,54 +23,11 @@ (define build-deps '("at-exp-lib" - "cover" "rackunit-lib" "racket-doc" "jack-scribble-example" "doc-coverage")) - (define test-omit-paths - '("info.rkt" - "lens/private/base/base.scrbl" - "lens/private/base/contract.scrbl" - "lens/private/base/laws.scrbl" - "lens/private/base/main.scrbl" - "lens/private/base/transform.scrbl" - "lens/private/base/view-set.scrbl" - "lens/private/compound/compose.scrbl" - "lens/private/compound/join-hash.scrbl" - "lens/private/compound/join-list.scrbl" - "lens/private/compound/join-string.scrbl" - "lens/private/compound/join-vector.scrbl" - "lens/private/compound/main.scrbl" - "lens/private/compound/thrush.scrbl" - "lens/private/doc-util" - "lens/private/hash/main.scrbl" - "lens/private/hash/nested.scrbl" - "lens/private/hash/pick.scrbl" - "lens/private/hash/ref.scrbl" - "lens/private/list/assoc.scrbl" - "lens/private/list/car-cdr.scrbl" - "lens/private/list/list-ref-take-drop.scrbl" - "lens/private/list/main.scrbl" - "lens/private/list/multi.scrbl" - "lens/private/struct/field.scrbl" - "lens/private/struct/main.scrbl" - "lens/private/struct/struct.scrbl" - "lens/private/test-util" - "lens/private/vector/main.scrbl" - "lens/private/vector/nested.scrbl" - "lens/private/vector/pick.scrbl" - "lens/private/vector/ref.scrbl" - "lens/applicable.scrbl" - "lens/private/dict.scrbl" - "lens/info.rkt" - "lens/main.scrbl" - "lens/private/stream.scrbl" - "lens/private/string.scrbl" - "unstable/lens/arrow.scrbl" - "unstable/lens/main.scrbl" - "unstable/lens/sublist.scrbl" - "unstable/lens/syntax.scrbl" - "unstable/lens/view-set.scrbl")) + '(#rx".*\\.scrbl" + "info.rkt")) From 2376fd9d5b33aaa058b5695f81f35a613f62ca32 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 18:25:14 -0800 Subject: [PATCH 02/16] Fix installation hanging --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb58183..21e833c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ before_install: - export PATH="${RACKET_DIR}/bin:${PATH}" - export VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/${CATALOG_VERSION}/catalog/" - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org - - raco pkg install cover - - raco pkg install cover-coveralls + - raco pkg install --deps search-auto cover + - raco pkg install --deps search-auto cover-coveralls install: - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR From a7522afced9ac2d46dfd87d0f08cc7acc22e1e95 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 18:51:11 -0800 Subject: [PATCH 03/16] Make cover specific so raco test succeeds on older racket versions --- info.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index d6af6c4..74d8cda 100644 --- a/info.rkt +++ b/info.rkt @@ -28,6 +28,6 @@ "jack-scribble-example" "doc-coverage")) -(define test-omit-paths +(define cover-omit-paths '(#rx".*\\.scrbl" "info.rkt")) From c4c1efbf6a2d9d519a2bc11443553b37587666c2 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 19:14:13 -0800 Subject: [PATCH 04/16] Ignore more things for coverage --- info.rkt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index 74d8cda..de7db69 100644 --- a/info.rkt +++ b/info.rkt @@ -30,4 +30,7 @@ (define cover-omit-paths '(#rx".*\\.scrbl" - "info.rkt")) + "info.rkt" + "lens/private/doc-util" + "lens/private/test-util" + "lens/private/util")) From b67786ebbd8dfc7a9bce0d79332ea0ab0aa3d9f1 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 21:51:39 -0800 Subject: [PATCH 05/16] Ignore more things to try and narrow down source of errors --- info.rkt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index de7db69..a4d433d 100644 --- a/info.rkt +++ b/info.rkt @@ -33,4 +33,5 @@ "info.rkt" "lens/private/doc-util" "lens/private/test-util" - "lens/private/util")) + "lens/private/util" + "lens/private")) From a663b392244850cf668da084a5379aff3e0d87e5 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 22:07:09 -0800 Subject: [PATCH 06/16] =?UTF-8?q?Ignore=20main.rkt,=20it=E2=80=99s=20faili?= =?UTF-8?q?ng=20for=20some=20reason?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- info.rkt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index a4d433d..666d3c9 100644 --- a/info.rkt +++ b/info.rkt @@ -34,4 +34,5 @@ "lens/private/doc-util" "lens/private/test-util" "lens/private/util" - "lens/private")) + "lens/private" + "lens/main.rkt")) From 66979680cee0703ae266d84fb3d792311e34afa6 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 22:16:00 -0800 Subject: [PATCH 07/16] Ignore unstable/lens too --- info.rkt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index 666d3c9..d4b115c 100644 --- a/info.rkt +++ b/info.rkt @@ -35,4 +35,5 @@ "lens/private/test-util" "lens/private/util" "lens/private" - "lens/main.rkt")) + "lens/main.rkt" + "unstable/lens")) From 5c9a11b61b67eeeea17321fb6091ddd5292733d8 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 22:26:45 -0800 Subject: [PATCH 08/16] Restrict to just struct-provide --- info.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index d4b115c..3557196 100644 --- a/info.rkt +++ b/info.rkt @@ -36,4 +36,4 @@ "lens/private/util" "lens/private" "lens/main.rkt" - "unstable/lens")) + "unstable/lens/struct-provide")) From 0e0846f44f3714e7b61bac58f4a3789ec7a13c9b Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 22:37:45 -0800 Subject: [PATCH 09/16] Fix missing extension --- info.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index 3557196..a91bc56 100644 --- a/info.rkt +++ b/info.rkt @@ -36,4 +36,4 @@ "lens/private/util" "lens/private" "lens/main.rkt" - "unstable/lens/struct-provide")) + "unstable/lens/struct-provide.rkt")) From 2d6ebe3462ee00fb028f496c0bf75a9b0883d054 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 23:00:57 -0800 Subject: [PATCH 10/16] Exclude syntax lenses too --- info.rkt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/info.rkt b/info.rkt index a91bc56..3fefe44 100644 --- a/info.rkt +++ b/info.rkt @@ -36,4 +36,5 @@ "lens/private/util" "lens/private" "lens/main.rkt" - "unstable/lens/struct-provide.rkt")) + "unstable/lens/struct-provide.rkt" + "unstable/lens/syntax.rkt")) From db260b5464f735bb9cc03a043c5a40843e671f89 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 23:15:33 -0800 Subject: [PATCH 11/16] Resume coverage analysis of internals --- info.rkt | 1 - 1 file changed, 1 deletion(-) diff --git a/info.rkt b/info.rkt index 3fefe44..3eb0ac0 100644 --- a/info.rkt +++ b/info.rkt @@ -34,7 +34,6 @@ "lens/private/doc-util" "lens/private/test-util" "lens/private/util" - "lens/private" "lens/main.rkt" "unstable/lens/struct-provide.rkt" "unstable/lens/syntax.rkt")) From 015fba60c204105b2c90a0f7acc40034105996a4 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 23:24:28 -0800 Subject: [PATCH 12/16] Ignore base main module Reprovide might not be playing nicely with cover --- info.rkt | 1 + 1 file changed, 1 insertion(+) diff --git a/info.rkt b/info.rkt index 3eb0ac0..2a44ae2 100644 --- a/info.rkt +++ b/info.rkt @@ -34,6 +34,7 @@ "lens/private/doc-util" "lens/private/test-util" "lens/private/util" + "lens/private/base/main.rkt" "lens/main.rkt" "unstable/lens/struct-provide.rkt" "unstable/lens/syntax.rkt")) From 99994ef3c12eb9e1d5f0994ee3d4bbf0a9aa9852 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 23:34:08 -0800 Subject: [PATCH 13/16] Yup it's definitely reprovide modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compound/main isn’t working now. Excluding all reprovide modules now (there’s really nothing to test in them anyway) --- info.rkt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/info.rkt b/info.rkt index 2a44ae2..8a6ffc9 100644 --- a/info.rkt +++ b/info.rkt @@ -30,11 +30,10 @@ (define cover-omit-paths '(#rx".*\\.scrbl" + "main.rkt" "info.rkt" "lens/private/doc-util" "lens/private/test-util" "lens/private/util" - "lens/private/base/main.rkt" - "lens/main.rkt" "unstable/lens/struct-provide.rkt" "unstable/lens/syntax.rkt")) From feab19a871c5c09ceddb7a065efe12b2d6a2a8a4 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 3 Dec 2015 23:44:22 -0800 Subject: [PATCH 14/16] Not all main/info modules were being omitted Only the top-level ones in the repo root were. --- info.rkt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.rkt b/info.rkt index 8a6ffc9..056a087 100644 --- a/info.rkt +++ b/info.rkt @@ -30,8 +30,8 @@ (define cover-omit-paths '(#rx".*\\.scrbl" - "main.rkt" - "info.rkt" + #rx"main\\.rkt" + #rx"info\\.rkt" "lens/private/doc-util" "lens/private/test-util" "lens/private/util" From 1f3093d2dae9fa84589411334035cf333b24998a Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Fri, 4 Dec 2015 00:00:32 -0800 Subject: [PATCH 15/16] Only install cover in job that needs it --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21e833c..d895831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ before_install: - export PATH="${RACKET_DIR}/bin:${PATH}" - export VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/${CATALOG_VERSION}/catalog/" - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org - - raco pkg install --deps search-auto cover - - raco pkg install --deps search-auto cover-coveralls + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; raco pkg install --deps search-auto cover; fi + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; raco pkg install --deps search-auto cover-coveralls; fi install: - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR From fe564cc8316109992fa27e469890c9983051b96e Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Fri, 4 Dec 2015 00:03:29 -0800 Subject: [PATCH 16/16] Fix bash syntax error --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d895831..567b74f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ before_install: - export PATH="${RACKET_DIR}/bin:${PATH}" - export VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/${CATALOG_VERSION}/catalog/" - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org - - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; raco pkg install --deps search-auto cover; fi - - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; raco pkg install --deps search-auto cover-coveralls; fi + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover; fi + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover-coveralls; fi install: - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR