зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1263506 - Ensure MOZ_GMP_PATH in gtests always has native dir separators. r=glandium
Without this, the GeckoMediaPlugin gtests fail, as the GMP stack is unable to load GMPs from disk. MozReview-Commit-ID: GGXdm2L5IF9
This commit is contained in:
Родитель
2175118c7d
Коммит
0bc89f86e9
|
@ -908,7 +908,10 @@ class GTestCommands(MachCommandBase):
|
|||
# https://code.google.com/p/googletest/wiki/AdvancedGuide#Running_Test_Programs:_Advanced_Options
|
||||
gtest_env = {b'GTEST_FILTER': gtest_filter}
|
||||
|
||||
xre_path = os.path.join(self.topobjdir, "dist", "bin")
|
||||
# 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")
|
||||
|
|
Загрузка…
Ссылка в новой задаче