From 37ba0f60c9cd4eec0ca832ab2069fcfb565bbbfd Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Tue, 5 Jun 2018 17:09:54 -0500 Subject: [PATCH] Bug 1466958 - Fix mochitests when run locally against an android build. r=gbrown MozReview-Commit-ID: Ie6665xeD53 --HG-- extra : rebase_source : f3d97973dc7770980c76ceb3bd799fb24a5252c0 --- testing/mochitest/mochitest_options.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py index bc9fe52ced59..b68d3cba00a5 100644 --- a/testing/mochitest/mochitest_options.py +++ b/testing/mochitest/mochitest_options.py @@ -916,6 +916,13 @@ class AndroidArguments(ArgumentContainer): if build_obj: options.log_mach = '-' + objdir_xpi_stage = os.path.join(build_obj.distdir, 'xpi-stage') + if os.path.isdir(objdir_xpi_stage): + options.extensionsToInstall = [ + os.path.join(objdir_xpi_stage, 'mochijar'), + os.path.join(objdir_xpi_stage, 'specialpowers'), + ] + if options.remoteWebServer is None: if os.name != "nt": options.remoteWebServer = moznetwork.get_ip()