Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bypass gstreamer check for test-wpt-android

Browse source
This commit is contained in:
Manish Goregaokar 2018-09-11 21:26:58 +05:30
parent 0e252a179f
commit 5d6701179c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/command_base.py
View file

@ -503,10 +503,10 @@ class CommandBase(object):
install them, let us know by filing a bug!") install them, let us know by filing a bug!")
return False return False
def set_run_env(self): def set_run_env(self, android=False):
"""Some commands, like test-wpt, don't use a full build env, """Some commands, like test-wpt, don't use a full build env,
but may still need dynamic search paths. This command sets that up""" but may still need dynamic search paths. This command sets that up"""
if self.needs_gstreamer_env(None): if not android and self.needs_gstreamer_env(None):
gstpath = self.get_gstreamer_path() gstpath = self.get_gstreamer_path()
os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib", "x86_64-linux-gnu") os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib", "x86_64-linux-gnu")

6
python/servo/testing_commands.py
View file

@ -380,10 +380,10 @@ class MachCommands(CommandBase):
binary_args=self.in_android_emulator(release, dev) + (binary_args or []), binary_args=self.in_android_emulator(release, dev) + (binary_args or []),
binary=sys.executable, binary=sys.executable,
) )
return self._test_wpt(**kwargs) return self._test_wpt(android=True, **kwargs)
def _test_wpt(self, **kwargs): def _test_wpt(self, android=False, **kwargs):
self.set_run_env() self.set_run_env(android)
hosts_file_path = path.join(self.context.topdir, 'tests', 'wpt', 'hosts') hosts_file_path = path.join(self.context.topdir, 'tests', 'wpt', 'hosts')
os.environ["hosts_file_path"] = hosts_file_path os.environ["hosts_file_path"] = hosts_file_path
run_file = path.abspath(path.join(self.context.topdir, "tests", "wpt", "run.py")) run_file = path.abspath(path.join(self.context.topdir, "tests", "wpt", "run.py"))