diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-11-18 17:26:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-19 12:54:32 +0000 |
commit | 4ed3c83240b3a761af71a3d10e295b4e5e356f00 (patch) | |
tree | 141a6c7703df6a6727449063afa02dc2d92412e9 /meta/lib/patchtest | |
parent | b3c2e1f30a9f187ee2657d787456e42644225e77 (diff) | |
download | poky-4ed3c83240b3a761af71a3d10e295b4e5e356f00.tar.gz |
patchtest: use HEAD commit as base for the selftest and not master
Patchtest applies patches on top of poky master branch by default;
this means selftest does the same, and any commits from the branch-under-test
are then discarded.
This can cause issues for example, if bitbake-server process started by selftest
from the master branch tries to parse bitbake.conf from the branch under test:
https://valkyrie.yoctoproject.org/#/builders/71/builds/460
(From OE-Core rev: 03c6b2e0277c00faf55c12c4d0b4b5e3a4898f8c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/patchtest')
-rwxr-xr-x | meta/lib/patchtest/selftest/selftest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/patchtest/selftest/selftest b/meta/lib/patchtest/selftest/selftest index 6fad50ce61..3cf1c361f7 100755 --- a/meta/lib/patchtest/selftest/selftest +++ b/meta/lib/patchtest/selftest/selftest | |||
@@ -38,7 +38,7 @@ def test(root, patch): | |||
38 | res = True | 38 | res = True |
39 | patchpath = os.path.abspath(os.path.join(root, patch)) | 39 | patchpath = os.path.abspath(os.path.join(root, patch)) |
40 | 40 | ||
41 | cmd = 'patchtest --repodir %s --testdir %s/tests --patch %s' % (repodir, topdir, patchpath) | 41 | cmd = 'patchtest --base-commit HEAD --repodir %s --testdir %s/tests --patch %s' % (repodir, topdir, patchpath) |
42 | results = subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True, shell=True) | 42 | results = subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True, shell=True) |
43 | 43 | ||
44 | return results | 44 | return results |