Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1348114 - Use correct default path for Robocop APK when building with Gradle. r=nalexander

Browse Source 
./mach robocop calls through to mochitest_options.py to validate the passed command line options, so it's not necessary to define a default Robocop APK path from two different places.

MozReview-Commit-ID: 8CryDqOKDBF

--HG--
extra : rebase_source : 843c1395fe384bc2a03bacf9a61b4abbdc4fca4c
This commit is contained in:
Jan Henning 2017-03-16 22:22:25 +01:00
parent d5666bbc13
commit 1e76a83f22
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/mochitest/mach_commands.py
View File

@ -432,11 +432,6 @@ class RobocopCommands(MachCommandBase):
kwargs['robocopIni'] = os.path.join(self.topobjdir, '_tests', 'testing',
'mochitest', 'robocop.ini')
if not kwargs.get('robocopApk'):
kwargs['robocopApk'] = os.path.join(self.topobjdir, 'mobile', 'android',
'tests', 'browser', 'robocop',
'robocop-debug.apk')
from mozbuild.controller.building import BuildDriver
self._ensure_state_subdir_exists('.')

12
testing/mochitest/mochitest_options.py
View File

@ -1026,9 +1026,15 @@ class AndroidArguments(ArgumentContainer):
options.robocopIni = os.path.abspath(options.robocopIni)
if not options.robocopApk and build_obj:
options.robocopApk = os.path.join(build_obj.topobjdir, 'mobile', 'android',
'tests', 'browser',
'robocop', 'robocop-debug.apk')
if build_obj.substs.get('MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE'):
options.robocopApk = os.path.join(build_obj.topobjdir, 'gradle', 'build',
'mobile', 'android', 'app', 'outputs', 'apk',
'app-automation-debug-androidTest-'
'unaligned.apk')
else:
options.robocopApk = os.path.join(build_obj.topobjdir, 'mobile', 'android',
'tests', 'browser',
'robocop', 'robocop-debug.apk')
if options.robocopApk != "":
if not os.path.exists(options.robocopApk):