Bug 1386826 - Whitelist the objdir, so _tests gets covered. r=jmaher

MozReview-Commit-ID: 8SHk1Pfy37I

--HG--
extra : rebase_source : 3944e20e310dda395e67ba9b1e33747413dea84e
This commit is contained in:
Gian-Carlo Pascutto 2017-08-16 19:03:09 +02:00
Родитель 38936d8d58
Коммит f4a0bc4497
5 изменённых файлов: 21 добавлений и 4 удалений

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

@ -79,6 +79,7 @@ class ReftestRunner(MozbuildObject):
args.extraProfileFiles.append(os.path.join(self.topobjdir, "dist", "plugins")) args.extraProfileFiles.append(os.path.join(self.topobjdir, "dist", "plugins"))
args.symbolsPath = os.path.join(self.topobjdir, "crashreporter-symbols") args.symbolsPath = os.path.join(self.topobjdir, "crashreporter-symbols")
args.workPath = self.topsrcdir args.workPath = self.topsrcdir
args.objPath = self.topobjdir
if not args.tests: if not args.tests:
args.tests = [os.path.join(*default_manifest[args.suite])] args.tests = [os.path.join(*default_manifest[args.suite])]

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

@ -244,7 +244,12 @@ class ReftestArgumentsParser(argparse.ArgumentParser):
self.add_argument("--work-path", self.add_argument("--work-path",
action="store", action="store",
dest="workPath", dest="workPath",
help="Path to the base dir of all test files.") help="Path to the base dir of all source files.")
self.add_argument("--obj-path",
action="store",
dest="objPath",
help="Path to the base dir of all object files.")
mozlog.commandline.add_logging_group(self) mozlog.commandline.add_logging_group(self)

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

@ -310,6 +310,11 @@ class RefTest(object):
sandbox_whitelist_paths.append(options.workPath) sandbox_whitelist_paths.append(options.workPath)
except AttributeError: except AttributeError:
pass pass
try:
if options.objPath:
sandbox_whitelist_paths.append(options.objPath)
except AttributeError:
pass
if (platform.system() == "Linux" or if (platform.system() == "Linux" or
platform.system() in ("Windows", "Microsoft")): platform.system() in ("Windows", "Microsoft")):
# Trailing slashes are needed to indicate directories on Linux and Windows # Trailing slashes are needed to indicate directories on Linux and Windows

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

@ -604,7 +604,13 @@ class MochitestArguments(ArgumentContainer):
[["--work-path"], [["--work-path"],
{"default": None, {"default": None,
"dest": "workPath", "dest": "workPath",
"help": "Path to the base dir of all test files.", "help": "Path to the base dir of all source files.",
"suppress": True,
}],
[["--obj-path"],
{"default": None,
"dest": "objPath",
"help": "Path to the base dir of all object files.",
"suppress": True, "suppress": True,
}], }],
[["--verify"], [["--verify"],

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

@ -1809,8 +1809,8 @@ toolbar#nav-bar {
except AttributeError: except AttributeError:
pass pass
try: try:
if options.topsrcdir: if options.objPath:
sandbox_whitelist_paths.append(options.topsrcdir) sandbox_whitelist_paths.append(options.objPath)
except AttributeError: except AttributeError:
pass pass
if (platform.system() == "Linux" or if (platform.system() == "Linux" or