summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-25 15:00:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:05 +0000
commit40cd22815cd252811db46a6768b0ea32db766f52 (patch)
treec791f49aa8880660b3bb7ac45475aa3769f5c363
parentd39192a8488667da33fdcb86e36856df158643d0 (diff)
downloadpoky-contrib-40cd22815cd252811db46a6768b0ea32db766f52.tar.gz
poky-contrib-40cd22815cd252811db46a6768b0ea32db766f52.tar.bz2
poky-contrib-40cd22815cd252811db46a6768b0ea32db766f52.zip
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>
-rw-r--r--meta/lib/oeqa/utils/sshcontrol.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 00f50510537..16587441656 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -136,8 +136,7 @@ class SSHControl(object):
timeout=0 - no timeout, let command run until it returns
"""
- # We need to source /etc/profile for a proper PATH on the target
- command = self.ssh + [self.ip, ' . /etc/profile; ' + command]
+ command = self.ssh + [self.ip, 'export PATH=/usr/sbin:/sbin:/usr/bin:/bin; ' + command]
if timeout is None:
return self._internal_run(command, self.defaulttimeout, self.ignore_status)