July 2017 - tor-commits - lists.torproject.org

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

26 Jul '17

commit 6d3c5b8fb5784240232a9265049b9e1660270df7 Merge: 3a7d75714 fca1934c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:53:13 2017 -0400 Merge branch 'bug22915_029_2' into maint-0.2.9 changes/bug22915 | 3 +++ src/common/util.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[tor/release-0.3.0] Suppress clang4-specific -Wdouble-promotion warnings
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit fca1934c88f1238a43d0bea5b06cea4fd15e7b93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 17:42:04 2017 -0400 Suppress clang4-specific -Wdouble-promotion warnings Wow, it sure seems like some compilers can't implement isnan() and friends in a way that pleases themselves! Fixes bug 22915. Bug trigged by 0.2.8.1-alpha and later; caused by clang 4. --- changes/bug22915 | 3 +++ src/common/util.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/changes/bug22915 b/changes/bug22915 new file mode 100644 index 000000000..17a9c6018 --- /dev/null +++ b/changes/bug22915 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation warnings): + - Suppress -Wdouble-promotion warnings with clang 4.0. Fixes bug 22915; + bugfix on 0.2.8.1-alpha. diff --git a/src/common/util.c b/src/common/util.c index 9e61eb771..d2cbacde3 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5705,6 +5705,18 @@ clamp_double_to_int64(double number) #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif + +/* + With clang 4.0 we apparently run into "double promotion" warnings here, + since clang thinks we're promoting a double to a long double. + */ +#if defined(__clang__) +#if __has_warning("-Wdouble-promotion") +#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING +DISABLE_GCC_WARNING(double-promotion) +#endif +#endif + /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@ -5730,6 +5742,10 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; + +#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING +ENABLE_GCC_WARNING(double-promotion) +#endif #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit f1431f439350948f2ec44e23d17d80de5aca9259 Merge: 4db33ecc0 d068f3359 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:53:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22915 | 3 +++ src/common/util.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[tor-browser-build/master] Include uid in tmp containers directory
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 9084d642cfc291df76b9fd4acecdce5aeb7f71b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:09:07 2017 +0200 Include uid in tmp containers directory This should allow multiple users to do builds on the same machine. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ce444d4..4ef6b90 100644 --- a/rbm.conf +++ b/rbm.conf @@ -28,7 +28,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Remove some unused options
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 0a9f7ef3459d4e19d22bc312cdaa5961eaa650da Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 11:40:54 2017 +0200 Remove some unused options --- projects/debootstrap-image/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 15eec3b..ecb7f2d 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -5,9 +5,6 @@ pkg_type: build var: ubuntu_version: 17.04 - container_dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' - container_user: rbm - container: use_container: 1 # We need CAP_SYS_ADMIN for debootstrap to work

1 0

[tor-browser-build/master] README: mention which version of runc is needed
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit b386c5f8af06e605bdb84c5bae8bde3c8afbd485 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:10:54 2017 +0200 README: mention which version of runc is needed --- README | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README b/README index fa968ff..2fcfadf 100644 --- a/README +++ b/README @@ -5,8 +5,12 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runC (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. +for runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +On Debian jessie, the runc package is available in backports. On Debian +stretch, the runc package is available in the main repository. +Version 0.1.1 of runc is required (which is the version available in +Debian stretch and jessie-backports). It is not yet working with runc +version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have access sudo access, which is required to be able to extract container file systems, start containers and copy

1 0

[stem/master] Drop unnecessary conditional from _get_tests()
by atagar＠torproject.org 26 Jul '17

26 Jul '17

commit 8402e0051ea08e994a3c5f43056f8611ca763b96 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 20 10:34:52 2017 -0700 Drop unnecessary conditional from _get_tests() Huh. Wonder why we checked if the import_name was present. Even if an empty string splitlines() will provide an empty list, not a list with a blank string. --- run_tests.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/run_tests.py b/run_tests.py index c0d9cbc8..0a799e4a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -105,16 +105,15 @@ def get_integ_tests(module_prefix = None): def _get_tests(modules, module_prefix): for import_name in modules: - if import_name: - module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf + module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf - if not module_prefix or module.startswith(module_prefix): - yield import_name - elif module_prefix.startswith(module): - # single test for this module + if not module_prefix or module.startswith(module_prefix): + yield import_name + elif module_prefix.startswith(module): + # single test for this module - test_module = module_prefix.rsplit('.', 1)[1] - yield '%s.%s' % (import_name, test_module) + test_name = module_prefix.rsplit('.', 1)[1] + yield '%s.%s' % (import_name, test_name) def get_torrc_entries(target):

1 0

[stem/master] Move get_torrc_entries() into runner
by atagar＠torproject.org 26 Jul '17

26 Jul '17

commit 448a5e96ba423b8bc4be33f29e3af64e07e46b82 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 25 11:03:45 2017 -0700 Move get_torrc_entries() into runner This helper is only used to translate targets into their extra torrc options. Rest of the torrc stuff resides in the runner so might as well put this there too. Not really settled on this yet but presently trying to make our run_tests.py easier to follow. I'll circle back to do the same for runner.py afterward. --- run_tests.py | 45 +++++++-------------------------------------- test/runner.py | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 40 deletions(-) diff --git a/run_tests.py b/run_tests.py index b9adf31c..e2bc19ad 100755 --- a/run_tests.py +++ b/run_tests.py @@ -38,7 +38,6 @@ CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', 'test.unit_tests': '', 'test.integ_tests': '', - 'target.torrc': {}, }) MOCK_UNAVAILABLE_MSG = """\ @@ -109,35 +108,6 @@ def _get_tests(modules, module_prefix): yield '%s.%s' % (import_name, test_name) -def get_torrc_entries(target): - """ - Provides the torrc entries used to run the given target. - - :param Target target: target to provide the custom torrc contents of - - :returns: list of :class:`~test.runner.Torrc` entries for the given target - - :raises: **ValueError** if the target.torrc config has entries that don't map - to test.runner.Torrc - """ - - # converts the 'target.torrc' csv into a list of test.runner.Torrc enums - - config_csv = CONFIG['target.torrc'].get(target) - torrc_opts = [] - - if config_csv: - for opt in config_csv.split(','): - opt = opt.strip() - - if opt in test.runner.Torrc.keys(): - torrc_opts.append(test.runner.Torrc[opt]) - else: - raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) - - return torrc_opts - - def main(): start_time = time.time() @@ -239,7 +209,8 @@ def main(): error_tracker.set_category('UNIT TEST') for test_class in get_unit_tests(args.specific_test): - run_result = _run_test(args, test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters) + test.output.print_logging(logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) println() @@ -252,20 +223,19 @@ def main(): error_tracker.set_category(target) try: - integ_runner.start(args.attribute_targets, args.tor_path, extra_torrc_opts = get_torrc_entries(target)) + integ_runner.start(target, args.attribute_targets, args.tor_path) println('Running tests...\n', STATUS) for test_class in get_integ_tests(args.specific_test): - run_result = _run_test(args, test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters) + test.output.print_logging(logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) except KeyboardInterrupt: println(' aborted starting tor: keyboard interrupt\n', ERROR) break except ValueError as exc: - # can arise if get_torrc_entries() runs into a bad settings.cfg data - - println(str(exc), ERROR) + println(str(exc), ERROR) # can arise if there's bad settings.cfg data break except OSError: error_tracker.register_error() @@ -356,7 +326,7 @@ def _print_static_issues(static_check_issues): println() -def _run_test(args, test_class, output_filters, logging_buffer): +def _run_test(args, test_class, output_filters): start_time = time.time() # Test classes look like... @@ -407,7 +377,6 @@ def _run_test(args, test_class, output_filters, logging_buffer): println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) println(test.output.apply_filters(test_results.getvalue(), *output_filters), NO_NL) - test.output.print_logging(logging_buffer) return run_result diff --git a/test/runner.py b/test/runner.py index 14795ce8..0a307c87 100644 --- a/test/runner.py +++ b/test/runner.py @@ -54,6 +54,7 @@ from test.output import println, STATUS, ERROR, SUBSTATUS, NO_NL CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', 'integ.log': './test/data/log', + 'target.torrc': {}, }) SOCKS_PORT = 1112 @@ -169,14 +170,14 @@ class Runner(object): self._owner_controller = None - def start(self, attribute_targets, tor_cmd, extra_torrc_opts): + def start(self, config_target, attribute_targets, tor_cmd): """ Makes temporary testing resources and starts tor, blocking until it completes. + :param str config_target: **Target** for this test run's torrc settings :param list attribute_targets: **Targets** for our non-configuration attributes :param str tor_cmd: command to start tor with - :param list extra_torrc_opts: additional torrc options for our test instance :raises: OSError if unable to run test preparations or start tor """ @@ -214,6 +215,18 @@ class Runner(object): os.chdir(tor_cwd) data_dir_path = './%s' % os.path.basename(self._test_dir) + config_csv = CONFIG['target.torrc'].get(config_target) + extra_torrc_opts = [] + + if config_csv: + for opt in config_csv.split(','): + opt = opt.strip() + + if opt in Torrc.keys(): + extra_torrc_opts.append(Torrc[opt]) + else: + raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) + self._custom_opts = extra_torrc_opts self._torrc_contents = BASE_TORRC % (data_dir_path, data_dir_path)

1 0

[stem/master] Fix couple suppressions for static checks
by atagar＠torproject.org 26 Jul '17

26 Jul '17

commit b67425b53196f75b940b4c7ea396ecc3985b4741 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 25 10:40:45 2017 -0700 Fix couple suppressions for static checks Huh. Not sure why this didn't come up on my last system. Fixing suppressions for couple red herrings... STATIC CHECKS * /home/atagar/Desktop/stem/stem/prereq.py line 101 - 'cryptography.hazmat.primitives.serialization.load_der_public_key' imported but unused | from cryptography.hazmat.primitives.serialization import load_der_public_key line 102 - 'cryptography.hazmat.primitives.ciphers.algorithms' imported but unused | from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes --- test/settings.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index 4d532ff8..4cc9d7ee 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -165,10 +165,10 @@ pyflakes.ignore stem/prereq.py => 'signing' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.utils.int_to_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.utils.int_from_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.backends.default_backend' imported but unused -pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.serialization.load_der_public_key' +pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.serialization.load_der_public_key' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.modes' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.Cipher' imported but unused -pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algorithms' +pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algorithms' imported but unused pyflakes.ignore stem/prereq.py => 'nacl.encoding' imported but unused pyflakes.ignore stem/prereq.py => 'nacl.signing' imported but unused pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input'

1 0

[stem/master] Move assertItemsEqual() into TimedTestRunner additions
by atagar＠torproject.org 26 Jul '17

26 Jul '17

commit a42cd3eb4539b6038aecaea44d9a4cdd3e46d002 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 20 12:06:30 2017 -0700 Move assertItemsEqual() into TimedTestRunner additions The TimedTestRunner provides python 2.6 compatability for methods added later, but there was one method we previously wired into with run_tests.py. Moving this to the TimedTestRunner too for consistency's sake. I'm a little tempted to deduplicate in favor of what run_tests.py does instead but I suppose this doesn't really matter since python 2.6 support will be going away with Stem 2.0. --- run_tests.py | 7 ------- stem/util/test_tools.py | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0a799e4a..b9adf31c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -64,13 +64,6 @@ New capabilities are: """ -if stem.prereq._is_python_26(): - def assertItemsEqual(self, expected, actual): - self.assertEqual(set(expected), set(actual)) - - unittest.TestCase.assertItemsEqual = assertItemsEqual - - def get_unit_tests(module_prefix = None): """ Provides the classes for our unit tests. diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 3094f5c0..d12ccf82 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -255,6 +255,12 @@ class TimedTestRunner(unittest.TextTestRunner): # TODO: remove when dropping python 2.6 support + def assertItemsEqual(self, expected, actual): + if stem.prereq._is_python_26(): + self.assertEqual(set(expected), set(actual)) + else: + return super(original_type, self).assertItemsEqual(expected, actual) + def assertRaisesRegexp(self, exc_type, exc_msg, func, *args, **kwargs): if stem.prereq._is_python_26(): try:

1 0