diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /testing/mochitest/runtests.py | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'testing/mochitest/runtests.py')
| -rw-r--r-- | testing/mochitest/runtests.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index 7d0c89a99..dd5439bd1 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -2024,9 +2024,8 @@ toolbar#nav-bar { # install specialpowers and mochikit as temporary addons addons = Addons(self.marionette) - if mozinfo.info.get('toolkit') != 'gonk': - addons.install(os.path.join(here, 'extensions', 'specialpowers'), temp=True) - addons.install(self.mochijar, temp=True) + addons.install(os.path.join(here, 'extensions', 'specialpowers'), temp=True) + addons.install(self.mochijar, temp=True) self.execute_start_script() |