diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-27 08:10:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-27 22:42:56 +0100 |
commit | e77c23cc35c7a39a089f6628309513509ac32925 (patch) | |
tree | 980e60daed057bfaeced88516c7748146bbdd88c /meta | |
parent | a3df47948fc95e2a7b2886ce5dc12c34ccd4ab2a (diff) | |
download | poky-e77c23cc35c7a39a089f6628309513509ac32925.tar.gz |
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.
(From OE-Core rev: 878764ab7252f9b5b67b697dcd51b961b673fda0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/recipetool.py | 2 |
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): | |||
112 | def test_recipetool_appendfile_binary(self): | 112 | def test_recipetool_appendfile_binary(self): |
113 | # Try appending a binary file | 113 | # Try appending a binary file |
114 | # /bin/ls can be a symlink to /usr/bin/ls | 114 | # /bin/ls can be a symlink to /usr/bin/ls |
115 | ls = os.readlink("/bin/ls") | 115 | ls = os.path.realpath("/bin/ls") |
116 | result = runCmd('recipetool appendfile %s /bin/ls %s -r coreutils' % (templayerdir, ls)) | 116 | result = runCmd('recipetool appendfile %s /bin/ls %s -r coreutils' % (templayerdir, ls)) |
117 | self.assertIn('WARNING: ', result.output) | 117 | self.assertIn('WARNING: ', result.output) |
118 | self.assertIn('is a binary', result.output) | 118 | self.assertIn('is a binary', result.output) |