summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-01-20 14:49:02 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-01-20 16:20:20 +1300
commit94534d47178659433e69c63f0733d1b9a9dad87f (patch)
treed96ec8ec9fcfbfc58a6f0b7eb090c9cf8f63ade0
parentfc97963bc61bf16112859fe1d7e460a13d34baca (diff)
downloadopenembedded-core-contrib-94534d47178659433e69c63f0733d1b9a9dad87f.tar.gz
openembedded-core-contrib-94534d47178659433e69c63f0733d1b9a9dad87f.tar.bz2
openembedded-core-contrib-94534d47178659433e69c63f0733d1b9a9dad87f.zip
oe-selftest: devtool: remove use of git -Cpaule/devtool-git-fix1
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.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 887c1e6b4c..dc3435fc2b 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -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')