From a5873d50c0216a7645e9732a509d873c83640a78 Mon Sep 17 00:00:00 2001 From: Gregory Mierzwinski Date: Tue, 15 Jun 2021 17:01:58 +0000 Subject: [PATCH] Bug 1716378 - Use correct test modules path in xpcshell layer. r=perftest-reviewers,kimberlythegeek Differential Revision: https://phabricator.services.mozilla.com/D117690 --- python/mozperftest/mozperftest/test/xpcshell.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/mozperftest/mozperftest/test/xpcshell.py b/python/mozperftest/mozperftest/test/xpcshell.py index c486b035cc68..da2baa681917 100644 --- a/python/mozperftest/mozperftest/test/xpcshell.py +++ b/python/mozperftest/mozperftest/test/xpcshell.py @@ -117,9 +117,11 @@ class XPCShell(Layer): if not plugins.exists(): plugins = Path(self.distdir, "plugins") kwargs["pluginsPath"] = str(plugins) - modules = binary.parent / "modules" + + modules = Path(self.topobjdir, "_tests", "modules") if not modules.exists(): - modules = Path(self.topobjdir, "_tests", "modules") + modules = binary.parent / "modules" + kwargs["testingModulesDir"] = str(modules) kwargs["utility_path"] = self.bindir kwargs["manifest"] = str(manifest)