summaryrefslogtreecommitdiffstats
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 11:53:51 +0000
commitb1b59b8a4b3e5962ecb036a9011ea9d202eda793 (patch)
treef734ca799b7da856764b004a8ef0bef9a56a1107 /meta
parentfc7394fe2d551a4c83e73741f8872ecbd6ab9037 (diff)
downloadpoky-b1b59b8a4b3e5962ecb036a9011ea9d202eda793.tar.gz
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. (From OE-Core rev: ce5c7075d530c0950f2feed35f95fbcd9f50721f) 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):
461 bitbake('mdadm -c package') 461 bitbake('mdadm -c package')
462 check_line(manfile, 'antique pin sardine', 'man file not modified. man searched file path: %s' % manfile) 462 check_line(manfile, 'antique pin sardine', 'man file not modified. man searched file path: %s' % manfile)
463 463
464 result = runCmd('git -C %s checkout -- %s' % (tempdir, modfile)) 464 result = runCmd('git checkout -- %s' % modfile, cwd=tempdir)
465 check_line(modfile, 'Linux Software RAID', 'man .in file not restored (git failed)') 465 check_line(modfile, 'Linux Software RAID', 'man .in file not restored (git failed)')
466 466
467 bitbake('mdadm -c package') 467 bitbake('mdadm -c package')