From 40cd22815cd252811db46a6768b0ea32db766f52 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 25 Nov 2015 15:00:50 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/sshcontrol.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/lib/oeqa/utils') 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): 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) -- cgit v1.2.3-54-g00ecf