summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2022-04-20 11:45:55 -0500
committerMatt A. Tobin <email@mattatobin.com>2022-04-20 11:45:55 -0500
commit87dabd4e0b724bb81db3eaeefa09cfd2c5545a36 (patch)
treef91a4de96d859747a5028abf252e87d3361006cb /python
parent1e640f82104e57d63e268785f75914ca7d3953ce (diff)
downloadaura-central-87dabd4e0b724bb81db3eaeefa09cfd2c5545a36.tar.gz
Issue #1 - Restore Gecko Media Plugins
Diffstat (limited to 'python')
-rw-r--r--python/mozbuild/mozbuild/mach_commands.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 55da508e4..876a53a81 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -925,6 +925,16 @@ class GTestCommands(MachCommandBase):
# https://code.google.com/p/googletest/wiki/AdvancedGuide#Running_Test_Programs:_Advanced_Options
gtest_env = {b'GTEST_FILTER': gtest_filter}
+ # Note: we must normalize the path here so that gtest on Windows sees
+ # a MOZ_GMP_PATH which has only Windows dir seperators, because
+ # nsILocalFile cannot open the paths with non-Windows dir seperators.
+ xre_path = os.path.join(os.path.normpath(self.topobjdir), "dist", "bin")
+ gtest_env["MOZ_XRE_DIR"] = xre_path
+ gtest_env["MOZ_GMP_PATH"] = os.pathsep.join(
+ os.path.join(xre_path, p, "1.0")
+ for p in ('gmp-fake', 'gmp-fakeopenh264')
+ )
+
gtest_env[b"MOZ_RUN_GTEST"] = b"True"
if shuffle: