Bug 1308400 - Whitelist paths with test files during testing. r=Alex_Gaynor

MozReview-Commit-ID: LMWAv3GP5c4

--HG--
extra : rebase_source : 80ae220e415510bb21c7f184eaaeb02ac27b91d0
This commit is contained in:
Gian-Carlo Pascutto 2017-07-10 20:29:09 +02:00
Родитель d791c78487
Коммит b4e7052362
4 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -1757,6 +1757,7 @@ toolbar#nav-bar {
options.extraPrefs.append( options.extraPrefs.append(
"browser.tabs.remote.autostart=%s" % "browser.tabs.remote.autostart=%s" %
('true' if options.e10s else 'false')) ('true' if options.e10s else 'false'))
options.extraPrefs.append( options.extraPrefs.append(
"dom.ipc.tabs.nested.enabled=%s" % "dom.ipc.tabs.nested.enabled=%s" %
('true' if options.nested_oop else 'false')) ('true' if options.nested_oop else 'false'))

Просмотреть файл

@ -117,6 +117,7 @@ config = {
"--screenshot-on-fail", "--screenshot-on-fail",
"--cleanup-crashes", "--cleanup-crashes",
"--marionette-startup-timeout=180", "--marionette-startup-timeout=180",
"--work-path=%(abs_work_dir)s",
], ],
"run_filename": "runtests.py", "run_filename": "runtests.py",
"testsdir": "mochitest" "testsdir": "mochitest"
@ -148,6 +149,7 @@ config = {
"--log-raw=%(raw_log_file)s", "--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s", "--log-errorsummary=%(error_summary_file)s",
"--cleanup-crashes", "--cleanup-crashes",
"--work-path=%(abs_work_dir)s",
], ],
"run_filename": "runreftest.py", "run_filename": "runreftest.py",
"testsdir": "reftest" "testsdir": "reftest"

Просмотреть файл

@ -250,6 +250,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
c = self.config c = self.config
dirs = {} dirs = {}
dirs['abs_work_dir'] = abs_dirs['abs_work_dir']
dirs['abs_app_install_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'application') dirs['abs_app_install_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'application')
dirs['abs_test_install_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tests') dirs['abs_test_install_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tests')
dirs['abs_test_extensions_dir'] = os.path.join(dirs['abs_test_install_dir'], 'extensions') dirs['abs_test_extensions_dir'] = os.path.join(dirs['abs_test_install_dir'], 'extensions')
@ -373,13 +374,13 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
str_format_values = { str_format_values = {
'binary_path': self.binary_path, 'binary_path': self.binary_path,
'symbols_path': self._query_symbols_url(), 'symbols_path': self._query_symbols_url(),
'abs_work_dir' : dirs['abs_work_dir'],
'abs_app_dir': abs_app_dir, 'abs_app_dir': abs_app_dir,
'abs_res_dir': abs_res_dir, 'abs_res_dir': abs_res_dir,
'raw_log_file': raw_log_file, 'raw_log_file': raw_log_file,
'error_summary_file': error_summary_file, 'error_summary_file': error_summary_file,
'gtest_dir': os.path.join(dirs['abs_test_install_dir'], 'gtest_dir': os.path.join(dirs['abs_test_install_dir'],
'gtest'), 'gtest'),
'abs_work_dir': dirs['abs_work_dir'],
} }
# TestingMixin._download_and_extract_symbols() will set # TestingMixin._download_and_extract_symbols() will set

Просмотреть файл

@ -950,8 +950,8 @@ class XPCShellTests(object):
self.env.setdefault('MOZ_DISABLE_NONLOCAL_CONNECTIONS', '1') self.env.setdefault('MOZ_DISABLE_NONLOCAL_CONNECTIONS', '1')
if self.mozInfo.get("topsrcdir") is not None: if self.mozInfo.get("topsrcdir") is not None:
self.env["MOZ_DEVELOPER_REPO_DIR"] = self.mozInfo["topsrcdir"].encode() self.env["MOZ_DEVELOPER_REPO_DIR"] = self.mozInfo["topsrcdir"].encode()
if self.mozInfo.get("topobjdir") is not None: if sys.platform.startswith('linux'):
self.env["MOZ_DEVELOPER_OBJ_DIR"] = self.mozInfo["topobjdir"].encode() self.env.setdefault('MOZ_SANDBOX_LOGGING', '1')
# Disable the content process sandbox for the xpcshell tests. They # Disable the content process sandbox for the xpcshell tests. They
# currently attempt to do things like bind() sockets, which is not # currently attempt to do things like bind() sockets, which is not