summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-04 14:40:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-12 08:42:27 +0000
commit8970ad60f5e6859a42a1999bed5c9b654c1fbbc0 (patch)
tree64902fe6669320db6e4b4533997e7dd817f38d52 /meta
parent4f7fdd0a590b2b370c641eca6e09adb1e4674c1c (diff)
downloadpoky-8970ad60f5e6859a42a1999bed5c9b654c1fbbc0.tar.gz
oeqa/selftest/devtool: fix test if build directory is not inside COREBASE
Fix test_devtool_update_recipe_git to work when build directory is not inside COREBASE. Fixes [YOCTO #8639]. (From OE-Core master rev: 0225888207f82e5f1d9e3dffb7c342a10169aea3) (From OE-Core rev: 16250994516ff907e18e71158aeb15e4d637de63) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index f48e6a2557..dcdef5a14b 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -582,7 +582,7 @@ class DevtoolTests(DevtoolBase):
582 # Now try with auto mode 582 # Now try with auto mode
583 runCmd('cd %s; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, os.path.basename(recipefile))) 583 runCmd('cd %s; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, os.path.basename(recipefile)))
584 result = runCmd('devtool update-recipe %s' % testrecipe) 584 result = runCmd('devtool update-recipe %s' % testrecipe)
585 result = runCmd('git rev-parse --show-toplevel') 585 result = runCmd('git rev-parse --show-toplevel', cwd=os.path.dirname(recipefile))
586 topleveldir = result.output.strip() 586 topleveldir = result.output.strip()
587 relpatchpath = os.path.join(os.path.relpath(os.path.dirname(recipefile), topleveldir), testrecipe) 587 relpatchpath = os.path.join(os.path.relpath(os.path.dirname(recipefile), topleveldir), testrecipe)
588 expected_status = [(' M', os.path.relpath(recipefile, topleveldir)), 588 expected_status = [(' M', os.path.relpath(recipefile, topleveldir)),