summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest/cases
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2023-12-06 21:55:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-08 16:58:34 +0000
commit389ef0d9e4767d2b081af96f36957ea5e44a0226 (patch)
tree61d6e8acd144791dc507ed81a82d1e21b0272706 /meta/lib/oeqa/selftest/cases
parent331f78ecc26d67eedc92c011556de4a972d99546 (diff)
downloadpoky-389ef0d9e4767d2b081af96f36957ea5e44a0226.tar.gz
oeqa/selftest/devtool: Avoid global Git hooks when amending a patch
To avoid potential problems due to global Git hooks, add --no-verify to a `git commit --amend` command. (From OE-Core rev: 802359c0ec6db0b3a4103f8ad8bc9bed67884555) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 14a9d2f923..e5daf949a6 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1495,7 +1495,7 @@ class DevtoolUpdateTests(DevtoolBase):
1495 # Modify one file 1495 # Modify one file
1496 srctree = os.path.join(self.workspacedir, 'sources', testrecipe) 1496 srctree = os.path.join(self.workspacedir, 'sources', testrecipe)
1497 runCmd('echo "Another line" >> README', cwd=srctree) 1497 runCmd('echo "Another line" >> README', cwd=srctree)
1498 runCmd('git commit -a --amend --no-edit', cwd=srctree) 1498 runCmd('git commit -a --amend --no-edit --no-verify', cwd=srctree)
1499 self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) 1499 self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)))
1500 result = runCmd('devtool update-recipe %s' % testrecipe) 1500 result = runCmd('devtool update-recipe %s' % testrecipe)
1501 expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)] 1501 expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]