summaryrefslogtreecommitdiffstats
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>2015-11-16 11:39:39 +0000
commita301f6e3b840e3b748fff5ccb68c645e87013105 (patch)
treed39d77c635a32d5cfcc8ee7fae98382bd1ec6a61
parentfd6bf771d0fa5cd1662ad51d3ae467fe75e7e801 (diff)
downloadpoky-a301f6e3b840e3b748fff5ccb68c645e87013105.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 rev: 0225888207f82e5f1d9e3dffb7c342a10169aea3) 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>
-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)),