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:37:17 +0000
commit0225888207f82e5f1d9e3dffb7c342a10169aea3 (patch)
tree6a6785e71219fe4aa2c44bde748aebc1e42df79a
parent8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f (diff)
downloadopenembedded-core-contrib-0225888207f82e5f1d9e3dffb7c342a10169aea3.tar.gz
openembedded-core-contrib-0225888207f82e5f1d9e3dffb7c342a10169aea3.tar.bz2
openembedded-core-contrib-0225888207f82e5f1d9e3dffb7c342a10169aea3.zip
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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):
# Now try with auto mode
runCmd('cd %s; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, os.path.basename(recipefile)))
result = runCmd('devtool update-recipe %s' % testrecipe)
- result = runCmd('git rev-parse --show-toplevel')
+ result = runCmd('git rev-parse --show-toplevel', cwd=os.path.dirname(recipefile))
topleveldir = result.output.strip()
relpatchpath = os.path.join(os.path.relpath(os.path.dirname(recipefile), topleveldir), testrecipe)
expected_status = [(' M', os.path.relpath(recipefile, topleveldir)),