- tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'bug29036-29962-034' into bug29036-29962-035
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 7014e57f4a05d2be5486aedd754272c70d365354 Merge: 3280e9a11 33be8d829 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:11:20 2019 +1000 Merge branch 'bug29036-29962-034' into bug29036-29962-035 Merge the moved coverage line from 29036 with the stem changes in maint-0.3.5. .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc .travis.yml index b5713d693,ed805aac3..f3ddd81ea --- a/.travis.yml +++ b/.travis.yml @@@ -201,9 -201,10 +203,11 @@@ script - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures. @@@ -213,11 -214,13 +217,14 @@@ - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - after_success: - ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi + before_cache: + ## Delete all gcov files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi + ## Delete the cargo registry before caching .cargo, because it's cheaper to + ## download the registry and throw it away, rather than caching it + - rm -rf $HOME/.cargo/registry notifications: irc:

1 0

[tor/release-0.4.0] Makefile: actually, don't delete the gcno files
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit f0cd8f804f8152355993acf0493b22b668f500b2 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:56:29 2019 +1000 Makefile: actually, don't delete the gcno files We need to keep the gcno files, because they are created at compile time. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4b1687f92..48d3df265 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,9 +148,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full +# We can't delete the gcno files, because they are created when tor is compiled reset-gcov: rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ - $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 5ac28787700862d242e74aab338db2a484f4c106 Merge: f9f6718c5 7fe169a50 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:55:22 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'bug29036-029' into bug29036-29962-034
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit a514e024769083908a35f28ac0df5f2e7b1137b8 Merge: 33be8d829 f0cd8f804 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:58:16 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge branch 'bug29036-29962-034' into bug29036-29962-035
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit db71bceb4048c0274001ee46ebab2c60f8d11259 Merge: 7014e57f4 a514e0247 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:58:32 2019 +1000 Merge branch 'bug29036-29962-034' into bug29036-29962-035 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/879' into maint-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 7fe169a5000d56f081191f4ca073453f2dc3610b Merge: 217db9efe db71bceb4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:55:09 2019 +0300 Merge branch 'tor-github/pr/879' into maint-0.4.0 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.4.0] Run `make reset-gcov` after the script target in Travis CI is done.
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Mar 18 15:27:14 2019 +0100 Run `make reset-gcov` after the script target in Travis CI is done. This should ensure that GCDA files are never entering the cache of Travis CI. See: https://bugs.torproject.org/29036 --- .travis.yml | 8 +++++--- changes/bug29036 | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 939f4f4e9..5319bbb89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,8 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -165,9 +167,9 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi -after_success: - ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi +before_cache: + # Delete all .gcda files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: irc: diff --git a/changes/bug29036 b/changes/bug29036 new file mode 100644 index 000000000..4de02adfe --- /dev/null +++ b/changes/bug29036 @@ -0,0 +1,5 @@ + o Minor bugfix (continuous integration): + - Reset coverage state on disk after Travis CI has finished. This is being + done to prevent future gcda file merge errors which causes the test suite + for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha. +

1 0

[tor/maint-0.4.0] Merge branch 'bug29036-029' into bug29036-29962-034
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit ac28e56ccb402d640f5adde186a765265ce855c7 Merge: 6d057c56f 57e9fe2bb Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:07:58 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.0] Makefile: delete all the gcov-related files in reset-gcov
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:49:27 2019 +1000 Makefile: delete all the gcov-related files in reset-gcov And fix a comment. See: https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files --- .travis.yml | 2 +- Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 336b67d29..456b5abc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -168,7 +168,7 @@ after_failure: - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi before_cache: - # Delete all .gcda files. + ## Delete all gcov files. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: diff --git a/Makefile.am b/Makefile.am index e4be3f26f..4b1687f92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full reset-gcov: - rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda + rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ + $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ + $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html coverage-html: all

1 0

[tor/maint-0.4.0] Handle errors from coveralls more gracefully.
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 20 15:44:06 2019 +0100 Handle errors from coveralls more gracefully. Since we have moved coveralls to the script target the entire build will now fail if coveralls fail. We handle it more gracefully by echo'ing the failure instead of doing a hard-failure. See: https://bugs.torproject.org/29036 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5319bbb89..336b67d29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ script: - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures.

1 0