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

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++ - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++ - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)

1 0

[tor/maint-0.3.3] Add support for the coveralls.io coverage tool in travis config
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +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 diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 000000000..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818.

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++ - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)

1 0

[tor/master] Add support for the coveralls.io coverage tool in travis config
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +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 diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 000000000..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818.

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 27534e4cf,bf55b7756..3d61f5a61 --- a/.travis.yml +++ b/.travis.yml @@@ -97,9 -96,9 +97,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: gcc env: RUST_OPTIONS="" + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++ - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit 002c5ca5d1986a0fad0c961113e512d47c2edfe0 Merge: c5bbf72fb 44aa586de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)

1 0