summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-01-20 14:49:02 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-20 09:33:49 +0000
commitce5c7075d530c0950f2feed35f95fbcd9f50721f (patch)
tree7f080488dcf3fc03cd64c73e0c0b69a197d1c93f /meta
parente3f5290d8deba9b7cead73b52ac45a37228fece9 (diff)
downloadopenembedded-core-ce5c7075d530c0950f2feed35f95fbcd9f50721f.tar.gz
openembedded-core-ce5c7075d530c0950f2feed35f95fbcd9f50721f.tar.bz2
openembedded-core-ce5c7075d530c0950f2feed35f95fbcd9f50721f.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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')