diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-16 11:42:59 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-16 11:42:59 -0600 |
| commit | cf39c672b66640ab28d12ab9e6c97c0af9344212 (patch) | |
| tree | 7e2111cb1f4fc2c51d7e346c103925f4a33d93cf /python/servo | |
| parent | ccc6faa14787765485dae7ccd0976cd7e1764185 (diff) | |
| parent | 0aa727e5b6437e3b1dc5377ba932c15f4b7b41c6 (diff) | |
| download | servo-cf39c672b66640ab28d12ab9e6c97c0af9344212.tar.gz servo-cf39c672b66640ab28d12ab9e6c97c0af9344212.zip | |
auto merge of #5210 : GreenRecycleBin/servo/#4968, r=jdm
`./mach test tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/security_location_0.sub.htm` is still failing with the same message as reported in #3219.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 5 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index b8474c85044..5075cad6487 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -120,7 +120,7 @@ class CommandBase(object): self._cargo_build_id = open(filename).read().strip() return self._cargo_build_id - def build_env(self, gonk=False): + def build_env(self, gonk=False, hosts_file_path=None): """Return an extended environment dictionary.""" env = os.environ.copy() extra_path = [] @@ -206,6 +206,9 @@ class CommandBase(object): if "ANDROID_TOOLCHAIN" in env: env["NDK_STANDALONE"] = env["ANDROID_TOOLCHAIN"] + if hosts_file_path: + env['HOST_FILE'] = hosts_file_path + return env def servo_crate(self): diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 9fb847d303a..4f4201885bc 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -30,8 +30,8 @@ class MachCommands(CommandBase): if self.context.built_tests: return returncode = Registrar.dispatch('build-tests', context=self.context) - if returncode: - sys.exit(returncode) + if returncode: + sys.exit(returncode) self.context.built_tests = True def find_test(self, prefix): @@ -238,7 +238,8 @@ class MachCommands(CommandBase): processes = str(multiprocessing.cpu_count()) if processes is None else processes params = params + ["--processes", processes] + hosts_file_path = path.join('tests', 'wpt', 'hosts') return subprocess.call( ["bash", path.join("tests", "wpt", "run.sh")] + params, - env=self.build_env()) + env=self.build_env(hosts_file_path=hosts_file_path)) |