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

[tor/master] In coverage builds, use branch-free timeradd() and timersub()
by dgoulet＠torproject.org 28 May '19

28 May '19

commit b88281024579d5f207d15d1a2cc54c113f8a2bde Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 08:28:25 2019 -0400 In coverage builds, use branch-free timeradd() and timersub() The ordinary definitions of timeradd() and timersub() contain a branch. However, in coverage builds, this means that we get spurious complaints about partially covered basic blocks, in a way that makes our coverage determinism harder to check. --- src/lib/wallclock/timeval.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/lib/wallclock/timeval.h b/src/lib/wallclock/timeval.h index 4967e939b..33076adc8 100644 --- a/src/lib/wallclock/timeval.h +++ b/src/lib/wallclock/timeval.h @@ -20,6 +20,27 @@ #include <sys/time.h> #endif +#ifdef TOR_COVERAGE +/* For coverage builds, we use a slower definition of these macros without + * branches, to make coverage consistent. */ +#undef timeradd +#undef timersub +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \ + (tvout)->tv_sec += (tvout)->tv_usec / 1000000; \ + (tvout)->tv_usec %= 1000000; \ + } while (0) +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec - 1; \ + (tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec + 1000000; \ + (tvout)->tv_sec += (tvout)->tv_usec / 1000000; \ + (tvout)->tv_usec %= 1000000; \ + } while (0) +#endif + #ifndef timeradd /** Replacement for timeradd on platforms that do not have it: sets tvout to * the sum of tv1 and tv2. */

1 0

[tor/master] cov-test-determinism: use the same RNG seed as in travis.yml
by dgoulet＠torproject.org 28 May '19

28 May '19

commit 7893f2cd73310aaf20283f72dc05167a23584ac6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 23 14:36:01 2019 -0400 cov-test-determinism: use the same RNG seed as in travis.yml We added this facility so that we could get deterministic PRNG behavior for coverage testing on tests that use a replaced PRNG. We need to have our coverage determinism tool test for this as well. --- scripts/test/cov-test-determinism.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/test/cov-test-determinism.sh b/scripts/test/cov-test-determinism.sh index 3b4f372e0..3458f9696 100755 --- a/scripts/test/cov-test-determinism.sh +++ b/scripts/test/cov-test-determinism.sh @@ -25,6 +25,9 @@ else fi if test "$run" = 1; then + # same seed as in travis.yml + TOR_TEST_RNG_SEED="636f766572616765" + export TOR_TEST_RNG_SEED while true; do make reset-gcov CD=coverage-raw/coverage-$(date +%s)

1 0

[tor/master] Coverage: do not include test-rebind in coverage builds.
by dgoulet＠torproject.org 28 May '19

28 May '19

commit 07ccffa989a8c6ac6ac216b6e729daed14372620 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 14:58:46 2019 -0400 Coverage: do not include test-rebind in coverage builds. Because it invokes the Tor mainloop, it does unpredictable things to test coverage of a lot of code that it doesn't actually test at all. (It is more an integration test than anything else.) --- src/test/include.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index 824089bc4..85f9c9f88 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -32,8 +32,15 @@ endif if USEPYTHON TESTSCRIPTS += src/test/test_ntor.sh src/test/test_hs_ntor.sh src/test/test_bt.sh + +if COVERAGE_ENABLED +# ... +else +# Only do this when coverage is not on, since it invokes lots of code +# in a kind of unpredictable way. TESTSCRIPTS += src/test/test_rebind.sh endif +endif TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_workqueue \

1 0

[tor/master] In coverage builds, avoid basic-block complexity in log_debug
by dgoulet＠torproject.org 28 May '19

28 May '19

commit 2bb5d8148b2c15e9573a7f041ef631bdf4429b4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 08:27:02 2019 -0400 In coverage builds, avoid basic-block complexity in log_debug Ordinarily we skip calling log_fn(LOG_DEBUG,...) if debug logging is completely disabled. However, in coverage builds, this means that we get spurious complaints about partially covered basic blocks, in a way that makes our coverage determinism harder to check. --- src/lib/log/log.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/log/log.h b/src/lib/log/log.h index a381220af..4a3ea0ad5 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -194,6 +194,11 @@ void tor_log_get_logfile_names(struct smartlist_t *out); extern int log_global_min_severity_; +#ifdef TOR_COVERAGE +/* For coverage builds, we try to avoid our log_debug optimization, since it + * can have weird effects on internal macro coverage. */ +#define debug_logging_enabled() (1) +#else static inline bool debug_logging_enabled(void); /** * Return true iff debug logging is enabled for at least one domain. @@ -202,6 +207,7 @@ static inline bool debug_logging_enabled(void) { return PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG); } +#endif void log_fn_(int severity, log_domain_mask_t domain, const char *funcname, const char *format, ...)

1 0

[tor/master] changes file for test coverage
by dgoulet＠torproject.org 28 May '19

28 May '19

commit 6d9e47702fe52b0817a593117a7f4a3eecf06ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 07:42:59 2019 -0400 changes file for test coverage --- changes/ticket30519 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30519 b/changes/ticket30519 new file mode 100644 index 000000000..efb25b929 --- /dev/null +++ b/changes/ticket30519 @@ -0,0 +1,4 @@ + o Minor features (testing): + - When running tests in coverage mode, take additional care to make + our coverage deterministic, so that we can accurately track changes in + code coverage. Closes ticket 30519.

1 0

[tor/master] Merge branch 'tor-github/pr/1047'
by dgoulet＠torproject.org 28 May '19

28 May '19

commit ff9aa32143849c69097000290b939f14c9bbcb36 Merge: 0a86f14ad 6d9e47702 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 28 14:59:07 2019 -0400 Merge branch 'tor-github/pr/1047' changes/ticket30519 | 4 ++++ scripts/test/cov-test-determinism.sh | 3 +++ src/lib/log/log.h | 6 ++++++ src/lib/wallclock/timeval.h | 21 +++++++++++++++++++++ src/test/include.am | 7 +++++++ 5 files changed, 41 insertions(+)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 2ee626cd8d64b600dcf719d0ce73ba0cf06adf28 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:48:05 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 72f9e50cb..79c99311e 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -169,10 +169,10 @@ msgid "" "three keys represent the layers of encryption between the user and each " "relay." msgstr "" -"L’image ci-dessous illustre un utilisateur qui navigue vers différents sites" -" Web avec Tor. Les ordinateurs verts situés au milieu représentent les " -"relais du réseau Tor, alors que les trois clés représentent les couches de " -"chiffrement entre l’utilisateur et chaque relais." +"Dans l’image ci-dessus, un utilisateur navigue vers différents sites Web " +"avec Tor. Les ordinateurs verts situés au milieu représentent les relais du " +"réseau Tor, alors que les trois clés représentent les couches de chiffrement" +" entre l’utilisateur et chaque relais." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 28 May '19

28 May '19

commit 137dfabe40cc71cfa680bbafb620b2f7490017e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:47:58 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 72f9e50cb..79c99311e 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -169,10 +169,10 @@ msgid "" "three keys represent the layers of encryption between the user and each " "relay." msgstr "" -"L’image ci-dessous illustre un utilisateur qui navigue vers différents sites" -" Web avec Tor. Les ordinateurs verts situés au milieu représentent les " -"relais du réseau Tor, alors que les trois clés représentent les couches de " -"chiffrement entre l’utilisateur et chaque relais." +"Dans l’image ci-dessus, un utilisateur navigue vers différents sites Web " +"avec Tor. Les ordinateurs verts situés au milieu représentent les relais du " +"réseau Tor, alors que les trois clés représentent les couches de chiffrement" +" entre l’utilisateur et chaque relais." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 28 May '19

28 May '19

commit 5cf006e491a5452267a623ff655189dc75f45c5b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:21:22 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b8aef3cb6..5937a0ec9 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1481,8 +1481,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" -"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for le " -"Navigateur Tor Update\">" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Vérification de " +"mise à jour du Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1496,7 +1496,9 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image5.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1506,7 +1508,9 @@ msgstr "Le Navigateur Tor installera les mises à jour." #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image3.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -1634,8 +1638,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"le " -"Navigateur Tor Menu\">" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Menu du " +"Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1685,8 +1689,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" -"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " -"Circuit for this Site\">" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"Nouveau" +" circuit pour ce site\">" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.title) @@ -3972,7 +3976,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Icône d’oignon\">" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -3989,8 +3993,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" -"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " -"with a padlock\">" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Oignon vert " +"avec un cadenas\">" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.title)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 28 May '19

28 May '19

commit cb8c6721db69ef07ed30095d473d100c8699d207 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 18:21:14 2019 +0000 Update translations for support-portal --- contents+fr.po | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b8aef3cb6..5937a0ec9 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1481,8 +1481,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" -"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for le " -"Navigateur Tor Update\">" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Vérification de " +"mise à jour du Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1496,7 +1496,9 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image5.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1506,7 +1508,9 @@ msgstr "Le Navigateur Tor installera les mises à jour." #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" +msgstr "" +"<img class=\"\" src=\"/static/images/image3.png\" alt=\"Alerte de nouvelle " +"version\">" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -1634,8 +1638,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"le " -"Navigateur Tor Menu\">" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Menu du " +"Navigateur Tor\">" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1685,8 +1689,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" -"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " -"Circuit for this Site\">" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"Nouveau" +" circuit pour ce site\">" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.title) @@ -3972,7 +3976,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Icône d’oignon\">" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -3989,8 +3993,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" -"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " -"with a padlock\">" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Oignon vert " +"avec un cadenas\">" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.title)

1 0