diff options
author | Ross Burton <ross.burton@intel.com> | 2015-11-25 15:00:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:05 +0000 |
commit | 40cd22815cd252811db46a6768b0ea32db766f52 (patch) | |
tree | c791f49aa8880660b3bb7ac45475aa3769f5c363 /meta | |
parent | d39192a8488667da33fdcb86e36856df158643d0 (diff) | |
download | poky-40cd22815cd252811db46a6768b0ea32db766f52.tar.gz |
oeqa/sshcontrol: don't source profile
Instead of sourcing /etc/profile to get $PATH including /usr/sbin, just assign
to PATH in the ssh invocation.
The remote /etc/profile may not actually be manipulating PATH as we expect, and
there may be other commands which can interfere with the tests (such as resize
emitting a series of control characters on connection).
(From OE-Core rev: 0f3fb5bbf2fd7db82898fed3281af143387316ff)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/utils/sshcontrol.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 00f5051053..1658744165 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py | |||
@@ -136,8 +136,7 @@ class SSHControl(object): | |||
136 | timeout=0 - no timeout, let command run until it returns | 136 | timeout=0 - no timeout, let command run until it returns |
137 | """ | 137 | """ |
138 | 138 | ||
139 | # We need to source /etc/profile for a proper PATH on the target | 139 | command = self.ssh + [self.ip, 'export PATH=/usr/sbin:/sbin:/usr/bin:/bin; ' + command] |
140 | command = self.ssh + [self.ip, ' . /etc/profile; ' + command] | ||
141 | 140 | ||
142 | if timeout is None: | 141 | if timeout is None: |
143 | return self._internal_run(command, self.defaulttimeout, self.ignore_status) | 142 | return self._internal_run(command, self.defaulttimeout, self.ignore_status) |