summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-30 10:46:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:03 +0100
commitb8962edd6b140178bed87f3a0ceab982264c3a17 (patch)
tree4bcf968d5856873211a159070b0a8ac1c7d4a9fd /meta/lib/oeqa
parent26d67b98f8583c501b9978405f7e602f25f16475 (diff)
downloadpoky-b8962edd6b140178bed87f3a0ceab982264c3a17.tar.gz
oeqa/runtime/xorg: use the right ps command for xorg test
Use our determined ps command, otherwise test fails for images with procps. (From OE-Core rev: 18e4d014bea3a5748f42e6dac648fa9b02230344) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/runtime/xorg.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/xorg.py b/meta/lib/oeqa/runtime/xorg.py
index 96cc20a50b..12dccd8198 100644
--- a/meta/lib/oeqa/runtime/xorg.py
+++ b/meta/lib/oeqa/runtime/xorg.py
@@ -11,8 +11,8 @@ class XorgTest(oeRuntimeTest):
11 11
12 @skipUnlessPassed('test_ssh') 12 @skipUnlessPassed('test_ssh')
13 def test_xorg_running(self): 13 def test_xorg_running(self):
14 (status, output) = self.target.run('ps | grep -v xinit | grep [X]org') 14 (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -v xinit | grep [X]org')
15 self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run('ps')[1]) 15 self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run(oeRuntimeTest.pscmd)[1])
16 16
17 @skipUnlessPassed('test_ssh') 17 @skipUnlessPassed('test_ssh')
18 def test_xorg_error(self): 18 def test_xorg_error(self):