From: Paul Eggleton Date: Wed, 4 Nov 2015 14:40:25 +0000 (+0000) Subject: oeqa/selftest/devtool: fix test if build directory is not inside COREBASE X-Git-Tag: 2016-4~2309 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0225888207f82e5f1d9e3dffb7c342a10169aea3;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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)),