Skip to contentSkip to conversation

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

PATCH Superseded Paul Eggleton 2 participants 3 messages Jan 20, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

The following changes since commit a7cb408dd784178197687a2129e936620bf6a0d3:

sanity.bbclass: Improved error message (2017-01-17 11:31:31 +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 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 94b6b39..face8b8 100644
@@ -473,7 +473,7 @@ class DevtoolTests(DevtoolBase):
         manfile = os.path.join(pkgd, mandir, 'man8', 'mdadm.8')
         check_TH_line(manfile, '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % manfile)
         # Test reverting the change
-        result = runCmd("git -C %s checkout -- %s" % (tempdir, modfile))
+        result = runCmd("git checkout -- %s" % modfile, cwd=tempdir)
         check_TH_line(modfile, '.TH MDADM 8 "" v3.4', 'man .in file not restored (git failed)')
         bitbake('mdadm -c package')
         pkgd = get_bb_var('PKGD', 'mdadm')
Signature · 1 line
2.5.5
#2 lore raw

✗ patchtest: failure for oe-selftest: devtool: remove use of git -C

In reply to Paul Eggleton

== Series Details ==

Series: oe-selftest: devtool: remove use of git -C
Revision: 1
URL : https://patchwork.openembedded.org/series/4861/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at fc97963bc6)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe