April 2019 - tor-commits - lists.torproject.org

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 316aed502e58102fa582ecd9902a3422c27b6dae Merge: ea5e37182 3fa42d599 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:32:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5 .travis.yml | 9 ++++++++- changes/bug30011 | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc .travis.yml index f3ddd81ea,e70344ee2..45da26324 --- a/.travis.yml +++ b/.travis.yml @@@ -204,10 -208,9 +210,11 @@@ script - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 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.

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3 Merge: 4aa02d3c7 db71bceb4 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:30:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit ea5e371822d58eb25eda912ba8afb8c0951b424c Merge: 44ea34111 db1c1dba3 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:31:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5 changes/bug30021 | 8 ++++++++ src/lib/tls/tortls_openssl.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 48e990359b05661f2dd0ae503143ee9b18442475 Merge: 102178e6d a0db5ade3 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:33:11 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748 Merge: 316aed502 48e990359 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:33:20 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 48e990359b05661f2dd0ae503143ee9b18442475 Merge: 102178e6d a0db5ade3 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:33:11 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Handle errors from coveralls more gracefully.
by teor＠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

[tor/maint-0.3.4] Run `make reset-gcov` after the script target in Travis CI is done.
by teor＠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.3.4] changes: Use the first Tor version with CI coverage for the 29036 changes file
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:40:16 2019 +1000 changes: Use the first Tor version with CI coverage for the 29036 changes file Otherwise, "make check-changes" will complain when we backport the change. --- changes/bug29036 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug29036 b/changes/bug29036 index 4de02adfe..8b96c5c8f 100644 --- a/changes/bug29036 +++ b/changes/bug29036 @@ -1,5 +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. - + for the process subsystem to fail. The process subsystem was introduced + in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.

1 0

[tor/maint-0.3.4] Makefile: delete all the gcov-related files in reset-gcov
by teor＠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