From 4ed3c83240b3a761af71a3d10e295b4e5e356f00 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 18 Nov 2024 17:26:41 +0100 Subject: 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/patchtest/selftest/selftest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib/patchtest') 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): res = True patchpath = os.path.abspath(os.path.join(root, patch)) - cmd = 'patchtest --repodir %s --testdir %s/tests --patch %s' % (repodir, topdir, patchpath) + cmd = 'patchtest --base-commit HEAD --repodir %s --testdir %s/tests --patch %s' % (repodir, topdir, patchpath) results = subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True, shell=True) return results -- cgit v1.2.3-54-g00ecf