Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5210 : GreenRecycleBin/servo/#4968, r=jdm

Browse source 
`./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.
This commit is contained in:
bors-servo 2015-03-16 11:42:59 -06:00
commit cf39c672b6
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/command_base.py
View file

@ -120,7 +120,7 @@ class CommandBase(object):
self._cargo_build_id = open(filename).read().strip() self._cargo_build_id = open(filename).read().strip()
return self._cargo_build_id 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.""" """Return an extended environment dictionary."""
env = os.environ.copy() env = os.environ.copy()
extra_path = [] extra_path = []
@ -206,6 +206,9 @@ class CommandBase(object):
if "ANDROID_TOOLCHAIN" in env: if "ANDROID_TOOLCHAIN" in env:
env["NDK_STANDALONE"] = env["ANDROID_TOOLCHAIN"] env["NDK_STANDALONE"] = env["ANDROID_TOOLCHAIN"]
if hosts_file_path:
env['HOST_FILE'] = hosts_file_path
return env return env
def servo_crate(self): def servo_crate(self):

7
python/servo/testing_commands.py
View file

@ -30,8 +30,8 @@ class MachCommands(CommandBase):
if self.context.built_tests: if self.context.built_tests:
return return
returncode = Registrar.dispatch('build-tests', context=self.context) returncode = Registrar.dispatch('build-tests', context=self.context)
if returncode: if returncode:
sys.exit(returncode) sys.exit(returncode)
self.context.built_tests = True self.context.built_tests = True
def find_test(self, prefix): def find_test(self, prefix):
@ -238,7 +238,8 @@ class MachCommands(CommandBase):
processes = str(multiprocessing.cpu_count()) if processes is None else processes processes = str(multiprocessing.cpu_count()) if processes is None else processes
params = params + ["--processes", processes] params = params + ["--processes", processes]
hosts_file_path = path.join('tests', 'wpt', 'hosts')
return subprocess.call( return subprocess.call(
["bash", path.join("tests", "wpt", "run.sh")] + params, ["bash", path.join("tests", "wpt", "run.sh")] + params,
env=self.build_env()) env=self.build_env(hosts_file_path=hosts_file_path))

6
tests/wpt/hosts Normal file
View file

@ -0,0 +1,6 @@
127.0.0.1 web-platform.test
127.0.0.1 www.web-platform.test
127.0.0.1 www1.web-platform.test
127.0.0.1 www2.web-platform.test
127.0.0.1 xn--n8j6ds53lwwkrqhv28a.web-platform.test
127.0.0.1 xn--lve-6lad.web-platform.test