aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2018-09-11 21:26:58 +0530
committerManish Goregaokar <manishsmail@gmail.com>2018-09-11 21:26:58 +0530
commit5d6701179c71abcd6a020091ec7d2cb6d47351ed (patch)
tree4a1a09bc43519d4ad48bd8153990077d6f2ce590 /python/servo
parent0e252a179f105eb10b4235a50aee693648f48188 (diff)
downloadservo-5d6701179c71abcd6a020091ec7d2cb6d47351ed.tar.gz
servo-5d6701179c71abcd6a020091ec7d2cb6d47351ed.zip
Bypass gstreamer check for test-wpt-android
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/command_base.py4
-rw-r--r--python/servo/testing_commands.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index d5269de42d2..c813242f85d 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -503,10 +503,10 @@ class CommandBase(object):
install them, let us know by filing a bug!")
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,
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()
os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib", "x86_64-linux-gnu")
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 957dfca22ae..8e18fce5437 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -380,10 +380,10 @@ class MachCommands(CommandBase):
binary_args=self.in_android_emulator(release, dev) + (binary_args or []),
binary=sys.executable,
)
- return self._test_wpt(**kwargs)
+ return self._test_wpt(android=True, **kwargs)
- def _test_wpt(self, **kwargs):
- self.set_run_env()
+ def _test_wpt(self, android=False, **kwargs):
+ self.set_run_env(android)
hosts_file_path = path.join(self.context.topdir, 'tests', 'wpt', 'hosts')
os.environ["hosts_file_path"] = hosts_file_path
run_file = path.abspath(path.join(self.context.topdir, "tests", "wpt", "run.py"))