wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1087791 - Follow-up on 340c1df41b69 (pushed wrong version of patch); r=nalexander

Browse Source
This commit is contained in:
Geoff Brown 2015-10-14 16:31:19 -06:00
parent 8b9857becb
commit 7919d70dc0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/tools/reftest/mach_commands.py
View File

@ -63,8 +63,6 @@ Add 'ENABLE_MARIONETTE=1' to your mozconfig file and re-build the application.
Your currently active mozconfig is %s.
'''.lstrip()
here = os.path.abspath(os.path.dirname(__file__))
class ReftestRunner(MozbuildObject):
"""Easily run reftests.
@ -212,8 +210,10 @@ class ReftestRunner(MozbuildObject):
#Remove the stdout handler from the internal logger and let mach deal with it
runreftest.log.removeHandler(runreftest.log.handlers[0])
self.log_manager.enable_unstructured()
rv = runreftest.run(**kwargs)
self.log_manager.disable_unstructured()
try:
rv = runreftest.run(**kwargs)
finally:
self.log_manager.disable_unstructured()
return rv
@ -287,8 +287,10 @@ class ReftestRunner(MozbuildObject):
# Remove the stdout handler from the internal logger and let mach deal with it
runreftest.log.removeHandler(runreftest.log.handlers[0])
self.log_manager.enable_unstructured()
rv = reftest.run(**kwargs)
self.log_manager.disable_unstructured()
try:
rv = reftest.run(**kwargs)
finally:
self.log_manager.disable_unstructured()
return rv
@ -304,6 +306,7 @@ def process_test_objects(kwargs):
del kwargs["test_objects"]
def get_parser():
here = os.path.abspath(os.path.dirname(__file__))
build_obj = MozbuildObject.from_environment(cwd=here)
if conditions.is_android(build_obj):
return reftestcommandline.RemoteArgumentsParser()

2
layout/tools/reftest/reftestcommandline.py
View File

@ -664,7 +664,7 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
dest="httpdPath",
help="path to the httpd.js file")
self.add_argument("--suppressDeviceInfo",
self.add_argument("--no-device-info",
action="store_false",
dest="printDeviceInfo",
default=True,