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

Bug 1321625 - Fix android_emulator_unittest.py for updated path of Marionette. r=gbrown

Browse Source 
MozReview-Commit-ID: 55HYhab2w5

--HG--
extra : rebase_source : b563864f0387c9fcd120ef9b6d528f231e6f7b0d
This commit is contained in:
Henrik Skupin 2016-12-01 21:00:18 +01:00
parent 6c5fe582cc
commit fced97c5d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mozharness/configs/android/androidarm_4_3.py
View File

@ -357,7 +357,7 @@ config = {
],
},
"marionette": {
"run_filename": os.path.join("marionette","runtests.py"),
"run_filename": os.path.join("harness", "marionette", "runtests.py"),
"testsdir": "marionette",
"options": [
"--emulator",

2
testing/mozharness/scripts/android_emulator_unittest.py
View File

@ -155,7 +155,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
dirs['abs_mochitest_dir'] = os.path.join(
dirs['abs_test_install_dir'], 'mochitest')
dirs['abs_marionette_dir'] = os.path.join(
dirs['abs_test_install_dir'], 'marionette', 'marionette')
dirs['abs_test_install_dir'], 'marionette', 'harness', 'marionette')
dirs['abs_marionette_tests_dir'] = os.path.join(
dirs['abs_test_install_dir'], 'marionette', 'tests', 'testing',
'marionette', 'harness', 'marionette', 'tests')