Skip to contentSkip to conversation

oe-selftest: devtool: remove use of git -C

PATCH New Paul Eggleton 1 participant 2 messages Jan 20, 2017

lore
Share & tools
lore
#0 lore raw

v2 cover oe-selftest: devtool: remove use of git -C

The following changes since commit fc97963bc61bf16112859fe1d7e460a13d34baca:

oeqa/selftest/devtool: rewrite modify testcase (2017-01-19 22:45:46 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/devtool-git-fix1
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/devtool-git-fix1

Paul Eggleton (1):
oe-selftest: devtool: remove use of git -C

 meta/lib/oeqa/selftest/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.5.5
#1 lore raw

PATCH v2 1/1 oe-selftest: devtool: remove use of git -C

The -C option isn't available in versions of git older than 1.8.5, and officially we only require git 1.8.3.1 or newer (and the latter is the version you'll find on CentOS 7, so the test fails there). In any case we can simply specify the working directory to runCmd() so just do that instead.

---
 meta/lib/oeqa/selftest/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/devtool.py +1 -1
index 887c1e6..dc3435f 100644
@@ -461,7 +461,7 @@ class DevtoolTests(DevtoolBase):
         bitbake('mdadm -c package')
         check_line(manfile, 'antique pin sardine', 'man file not modified. man searched file path: %s' % manfile)
 
-        result = runCmd('git -C %s checkout -- %s' % (tempdir, modfile))
+        result = runCmd('git checkout -- %s' % modfile, cwd=tempdir)
         check_line(modfile, 'Linux Software RAID', 'man .in file not restored (git failed)')
 
         bitbake('mdadm -c package')
Signature · 1 line
2.5.5