summaryrefslogtreecommitdiffstats
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:45:32 +0100
commit80db456387fb63ee74d53a9719ab3997432f4c80 (patch)
tree86eaa16f31f28f17986128039ac3ae61f64f06b6
parenta8db39548d9985962e4f8764b10856af5226d210 (diff)
downloadopenembedded-core-contrib-80db456387fb63ee74d53a9719ab3997432f4c80.tar.gz
openembedded-core-contrib-80db456387fb63ee74d53a9719ab3997432f4c80.tar.bz2
openembedded-core-contrib-80db456387fb63ee74d53a9719ab3997432f4c80.zip
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 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
class LddTest(OERuntimeTestCase):
@OETestID(962)
- @skipIfNotFeature('tools-sdk',
- 'Test requires tools-sdk to be in IMAGE_FEATURES')
+ @OEHasPackage(["ldd"])
@OETestDepends(['ssh.SSHTest.test_ssh'])
- def test_ldd_exists(self):
+ def test_ldd(self):
status, output = self.target.run('which ldd')
msg = 'ldd does not exist in PATH: which ldd: %s' % output
self.assertEqual(status, 0, msg=msg)
- @OETestID(239)
- @OETestDepends(['ldd.LddTest.test_ldd_exists'])
- def test_ldd_rtldlist_check(self):
cmd = ('for i in $(which ldd | xargs cat | grep "^RTLDLIST"| '
'cut -d\'=\' -f2|tr -d \'"\'); '
'do test -f $i && echo $i && break; done')
status, output = self.target.run(cmd)
- msg = "ldd path not correct or RTLDLIST files don't exist."
- self.assertEqual(status, 0, msg=msg)
+ self.assertEqual(status, 0, msg="ldd path not correct or RTLDLIST files don't exist.")
+
+ status, output = self.target.run("ldd /bin/true")
+ self.assertEqual(status, 0, msg="ldd failed to execute: %s" % output)