summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-22 12:47:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 07:50:00 +0100
commit652d25c09de306cb20efcff74581c2de7b6a90ce (patch)
treea5dd48526d2dd2bd67e34903e23133b2e63fc6f7 /meta/lib
parentf99a77a2dbce3a1078e9ad8db060d8fbe344544c (diff)
downloadpoky-652d25c09de306cb20efcff74581c2de7b6a90ce.tar.gz
oeqa/runtime/ldd: Clean up test
* Merge the two tests together as having them separate is pointless * Test that ldd runs correctly * Add in a dependency on the "ldd" package being installed instead of the sdk tools feature (From OE-Core rev: 80db456387fb63ee74d53a9719ab3997432f4c80) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/cases/ldd.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/lib/oeqa/runtime/cases/ldd.py b/meta/lib/oeqa/runtime/cases/ldd.py
index c6d92fd5af..5bde1845d9 100644
--- a/meta/lib/oeqa/runtime/cases/ldd.py
+++ b/meta/lib/oeqa/runtime/cases/ldd.py
@@ -2,24 +2,23 @@ from oeqa.runtime.case import OERuntimeTestCase
2from oeqa.core.decorator.depends import OETestDepends 2from oeqa.core.decorator.depends import OETestDepends
3from oeqa.core.decorator.oeid import OETestID 3from oeqa.core.decorator.oeid import OETestID
4from oeqa.core.decorator.data import skipIfNotFeature 4from oeqa.core.decorator.data import skipIfNotFeature
5from oeqa.runtime.decorator.package import OEHasPackage
5 6
6class LddTest(OERuntimeTestCase): 7class LddTest(OERuntimeTestCase):
7 8
8 @OETestID(962) 9 @OETestID(962)
9 @skipIfNotFeature('tools-sdk', 10 @OEHasPackage(["ldd"])
10 'Test requires tools-sdk to be in IMAGE_FEATURES')
11 @OETestDepends(['ssh.SSHTest.test_ssh']) 11 @OETestDepends(['ssh.SSHTest.test_ssh'])
12 def test_ldd_exists(self): 12 def test_ldd(self):
13 status, output = self.target.run('which ldd') 13 status, output = self.target.run('which ldd')
14 msg = 'ldd does not exist in PATH: which ldd: %s' % output 14 msg = 'ldd does not exist in PATH: which ldd: %s' % output
15 self.assertEqual(status, 0, msg=msg) 15 self.assertEqual(status, 0, msg=msg)
16 16
17 @OETestID(239)
18 @OETestDepends(['ldd.LddTest.test_ldd_exists'])
19 def test_ldd_rtldlist_check(self):
20 cmd = ('for i in $(which ldd | xargs cat | grep "^RTLDLIST"| ' 17 cmd = ('for i in $(which ldd | xargs cat | grep "^RTLDLIST"| '
21 'cut -d\'=\' -f2|tr -d \'"\'); ' 18 'cut -d\'=\' -f2|tr -d \'"\'); '
22 'do test -f $i && echo $i && break; done') 19 'do test -f $i && echo $i && break; done')
23 status, output = self.target.run(cmd) 20 status, output = self.target.run(cmd)
24 msg = "ldd path not correct or RTLDLIST files don't exist." 21 self.assertEqual(status, 0, msg="ldd path not correct or RTLDLIST files don't exist.")
25 self.assertEqual(status, 0, msg=msg) 22
23 status, output = self.target.run("ldd /bin/true")
24 self.assertEqual(status, 0, msg="ldd failed to execute: %s" % output)