author | Maja Frydrychowicz <mjzffr@gmail.com> |
Wed, 31 Aug 2016 12:54:52 -0400 | |
changeset 312060 | 21f26d14f34b2555c707a724d4d25f38d5b4a656 |
parent 312059 | 23162c502edcdf9aff8a48aa28822815719b1a0e |
child 312061 | 2c986272197fedc498235e2a012c8a3e13993b58 |
child 312167 | c18c990a038f752ffbeea92b1d71b3d5d0039f4f |
push id | 31893 |
push user | mjzffr@gmail.com |
push date | Wed, 31 Aug 2016 18:24:14 +0000 |
treeherder | autoland@21f26d14f34b [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gbrown |
bugs | 1299242, 1284874 |
milestone | 51.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
testing/mozharness/scripts/android_emulator_unittest.py | file | annotate | diff | comparison | revisions |
--- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -165,26 +165,26 @@ class AndroidEmulatorTest(BlobUploadMixi if key not in abs_dirs: abs_dirs[key] = dirs[key] self.abs_dirs = abs_dirs return self.abs_dirs @PreScriptAction('create-virtualenv') def _pre_create_virtualenv(self, action): dirs = self.query_abs_dirs() - + requirements = None if os.path.isdir(dirs['abs_mochitest_dir']): # mochitest is the only thing that needs this requirements = os.path.join(dirs['abs_mochitest_dir'], 'websocketprocessbridge', 'websocketprocessbridge_requirements.txt') elif self.test_suite == 'marionette': requirements = os.path.join(dirs['abs_test_install_dir'], 'config', 'marionette_requirements.txt') - + if requirements: self.register_virtualenv_module(requirements=[requirements], two_pass=True) def _launch_emulator(self): env = self.query_env() # Set $LD_LIBRARY_PATH to self.dirs['abs_work_dir'] so that # the emulator picks up the symlink to libGL.so.1 that we