summaryrefslogtreecommitdiff
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 08:10:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 22:42:00 +0100
commit878764ab7252f9b5b67b697dcd51b961b673fda0 (patch)
treed9bcf4f5ca896cc19f2cd3fd4a3c53658d8dbffe /meta/lib/oeqa/selftest
parent4ad19f0c570de890ec53bf2d5c1bd6697f035612 (diff)
downloadopenembedded-core-878764ab7252f9b5b67b697dcd51b961b673fda0.tar.gz
openembedded-core-878764ab7252f9b5b67b697dcd51b961b673fda0.tar.bz2
openembedded-core-878764ab7252f9b5b67b697dcd51b961b673fda0.zip
oeqa/recipetool: Fix symlink resolution
Instead of readlink we need to use realpath to resolve any possible symlink in the file name. I'd got the two confused in the previous patch. This should really fix selftest failures on the autobuilder. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/recipetool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index c08b2e4674..b3ca171698 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -112,7 +112,7 @@ class RecipetoolTests(DevtoolBase):
def test_recipetool_appendfile_binary(self):
# Try appending a binary file
# /bin/ls can be a symlink to /usr/bin/ls
- ls = os.readlink("/bin/ls")
+ ls = os.path.realpath("/bin/ls")
result = runCmd('recipetool appendfile %s /bin/ls %s -r coreutils' % (templayerdir, ls))
self.assertIn('WARNING: ', result.output)
self.assertIn('is a binary', result.output)