diff options
| author | Don Garrett <dgarrett@google.com> | 2016-01-13 17:34:22 -0800 |
|---|---|---|
| committer | Don Garrett <dgarrett@google.com> | 2016-01-13 17:34:22 -0800 |
| commit | f572e914cd5dcfe66b651fe29d2e70cc9721ba7b (patch) | |
| tree | f6a60bf28a116e21d713fe267621d211263adba7 | |
| parent | fbf0424bb8d5a406416bd14dbefadd2a03e47305 (diff) | |
| download | bbuildbot_config-f572e914cd5dcfe66b651fe29d2e70cc9721ba7b.tar.gz | |
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
| -rw-r--r-- | builders/brillo_builders.py | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ class BrilloVmTestStage(BrilloStageBase): 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, |