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

[tor/maint-0.3.3] squash! Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit ee860b8f37707cf60daae21b806d4d473daaf2d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 12:21:25 2018 -0400 squash! Make sure that the test_rust.sh script fails when a test fails Also make sure that we're actually running the test from within the right cwd, like we do when we're building. This seems necessary to avoid an error when running offline. Amusingly, it appears that we had this bug before: we just weren't noticing it, because of bug 26258. --- src/test/include.am | 1 + src/test/test_rust.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index b768f7447..cc4f3e5c8 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -9,6 +9,7 @@ TESTS_ENVIRONMENT = \ export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ + export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; TESTSCRIPTS = \ diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 854582ec1..8e8d29b89 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -4,11 +4,15 @@ set -e -for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "$cargo_toml" || exitcode=1 +for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do + if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then + cd "${cargo_toml_dir}" && \ + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + ${EXTRA_CARGO_OPTIONS} \ + --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 + fi done exit $exitcode

1 0

[tor/master] Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 9d06c41c6e69e25a68639a09b22baa7de3299fa9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 17:15:57 2018 -0700 Make sure that the test_rust.sh script fails when a test fails Exit codes from find(1) seem not to be so reliable as we had hoped. Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560 --- changes/bug26258_033 | 4 ++++ src/test/test_rust.sh | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug26258_033 b/changes/bug26258_033 new file mode 100644 index 000000000..ceca38333 --- /dev/null +++ b/changes/bug26258_033 @@ -0,0 +1,4 @@ + o Major bugfixes (rust, testing): + - Fix a bug where a failure in the rust unit tests would not actually + cause the build to fail. Fixes bug 26258; bugfix on 0.3.3.4-alpha. + diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index d87336e70..854582ec1 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,13 +3,14 @@ set -e -CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + +for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - find "${abs_top_srcdir:-../../..}/src/rust" \ - -mindepth 2 -maxdepth 2 \ - -type f -name 'Cargo.toml' \ - -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path '{}' \; + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path "$cargo_toml" || exitcode=1 +done + +exit $exitcode -exit $?

1 0

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

14 Jun '18

commit 945d871da54e6038fdabaf3b78a7a55b290ab6aa Merge: ed7b13581 71065201d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 14 12:49:57 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26258_033 | 4 ++++ src/test/include.am | 1 + src/test/test_rust.sh | 24 +++++++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-)

1 0

[tor/master] squash! Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit ee860b8f37707cf60daae21b806d4d473daaf2d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 12:21:25 2018 -0400 squash! Make sure that the test_rust.sh script fails when a test fails Also make sure that we're actually running the test from within the right cwd, like we do when we're building. This seems necessary to avoid an error when running offline. Amusingly, it appears that we had this bug before: we just weren't noticing it, because of bug 26258. --- src/test/include.am | 1 + src/test/test_rust.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index b768f7447..cc4f3e5c8 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -9,6 +9,7 @@ TESTS_ENVIRONMENT = \ export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ + export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; TESTSCRIPTS = \ diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 854582ec1..8e8d29b89 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -4,11 +4,15 @@ set -e -for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "$cargo_toml" || exitcode=1 +for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do + if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then + cd "${cargo_toml_dir}" && \ + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + ${EXTRA_CARGO_OPTIONS} \ + --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 + fi done exit $exitcode

1 0

[tor/master] Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 71065201dd6dcaf08238a2d09a604dfcdb4aa271 Merge: ca6d289c0 ee860b8f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 14 12:47:09 2018 -0400 Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3 changes/bug26258_033 | 4 ++++ src/test/include.am | 1 + src/test/test_rust.sh | 23 ++++++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 9d06c41c6e69e25a68639a09b22baa7de3299fa9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 17:15:57 2018 -0700 Make sure that the test_rust.sh script fails when a test fails Exit codes from find(1) seem not to be so reliable as we had hoped. Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560 --- changes/bug26258_033 | 4 ++++ src/test/test_rust.sh | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug26258_033 b/changes/bug26258_033 new file mode 100644 index 000000000..ceca38333 --- /dev/null +++ b/changes/bug26258_033 @@ -0,0 +1,4 @@ + o Major bugfixes (rust, testing): + - Fix a bug where a failure in the rust unit tests would not actually + cause the build to fail. Fixes bug 26258; bugfix on 0.3.3.4-alpha. + diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index d87336e70..854582ec1 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,13 +3,14 @@ set -e -CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + +for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - find "${abs_top_srcdir:-../../..}/src/rust" \ - -mindepth 2 -maxdepth 2 \ - -type f -name 'Cargo.toml' \ - -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path '{}' \; + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path "$cargo_toml" || exitcode=1 +done + +exit $exitcode -exit $?

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 6ea38c4b55d2624979f281701e4d74add6438396 Merge: 8e9996752 71065201d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 14 12:50:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26258_033 | 4 ++++ src/test/include.am | 1 + src/test/test_rust.sh | 23 ++++++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 71065201dd6dcaf08238a2d09a604dfcdb4aa271 Merge: ca6d289c0 ee860b8f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 14 12:47:09 2018 -0400 Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3 changes/bug26258_033 | 4 ++++ src/test/include.am | 1 + src/test/test_rust.sh | 23 ++++++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] squash! Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit ee860b8f37707cf60daae21b806d4d473daaf2d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 12:21:25 2018 -0400 squash! Make sure that the test_rust.sh script fails when a test fails Also make sure that we're actually running the test from within the right cwd, like we do when we're building. This seems necessary to avoid an error when running offline. Amusingly, it appears that we had this bug before: we just weren't noticing it, because of bug 26258. --- src/test/include.am | 1 + src/test/test_rust.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index b768f7447..cc4f3e5c8 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -9,6 +9,7 @@ TESTS_ENVIRONMENT = \ export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ + export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; TESTSCRIPTS = \ diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 854582ec1..8e8d29b89 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -4,11 +4,15 @@ set -e -for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "$cargo_toml" || exitcode=1 +for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do + if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then + cd "${cargo_toml_dir}" && \ + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + ${EXTRA_CARGO_OPTIONS} \ + --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 + fi done exit $exitcode

1 0

[tor-browser-build/master] Bug 26203: Update mozconfig for Windows nightly build
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 656090e748599053adfb9d0c31b6955ba7ef8129 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 12 22:04:06 2018 -0400 Bug 26203: Update mozconfig for Windows nightly build Also enable rust for all builds. --- projects/firefox/build | 8 +++----- projects/firefox/config | 1 - projects/firefox/mozconfig-windows-i686 | 3 +++ projects/firefox/mozconfig-windows-x86_64 | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 81032c6..09620ae 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -65,11 +65,9 @@ EOF export SELFRANDO_skip_shuffle= [% END -%] -[% IF ! c("var/windows") %] - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] - export PATH="/var/tmp/dist/rust/bin:$PATH" -[% END -%] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" [% IF c("var/linux") %] # Add llvm so stylo can build diff --git a/projects/firefox/config b/projects/firefox/config index 5bde93d..120ad35 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -108,7 +108,6 @@ input_files: enable: '[% c("var/windows-x86_64") %]' - project: rust name: rust - enable: '[% ! c("var/windows") %]' - project: llvm name: llvm enable: '[% c("var/linux") %]' diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index dfb3326..daeaed4 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -24,3 +24,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +ac_add_options --disable-stylo # Bugzilla 1390583 +ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ +ac_add_options --disable-jemalloc # Bugzilla 1466192 diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 669c124..568d88d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -18,12 +18,12 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar -# We can't build the sandbox code with mingw-w64: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 -ac_add_options --disable-sandbox # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +ac_add_options --disable-stylo # Bugzilla 1390583 +ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ +ac_add_options --disable-jemalloc # Bugzilla 1466192

1 0