Force 'bash' when starting emulator.
When invoking the emulator, we use a shell to allow full setup of the
runtime environment variables. We were using the default shell for the
account, which might be bash or sh, but the commands are bash specific.
Force the use of bash.
BUG=chromium:570810
TEST=bin/cbuildbot --nobootstrap --noreexec --buildbot
--debug --buildroot ~/tmp/buildroot bbuildbot
Change-Id: I7fddcd03bb3d1f0489fa8a0b2e00c5d16b66a95b
diff --git a/builders/brillo_builders.py b/builders/brillo_builders.py
index a97088c..568f4f8 100644
--- a/builders/brillo_builders.py
+++ b/builders/brillo_builders.py
@@ -108,11 +108,10 @@
def RunEmulator(self):
"""Run an emulator process in the background, kill it on exit."""
with tempfile.NamedTemporaryFile(prefix='emulator') as logfile:
- cmd = self.FindShellCmd([self._run.config.emulator])
+ cmd = ['/bin/bash', '-c', self.FindShellCmd([self._run.config.emulator])]
logging.info('Starting emulator: %s', cmd)
p = subprocess.Popen(
- args=(cmd,),
- shell=True,
+ args=cmd,
close_fds=True,
stdout=logfile,
stderr=subprocess.STDOUT,
