diff mbox series

[10/11] patchtest: selftest: rework test files

Message ID 20260514194207.1958325-11-tgamblin@baylibre.com
State New
Headers show
Series patchtest: improve testing coverage | expand

Commit Message

Trevor Gamblin May 14, 2026, 7:42 p.m. UTC 
Modify all of the selftest files so that they merge cleanly (except for
the ones we expect to fail that test). This manifests as a change to the
S variable and hunk offset adjustments.

AI-Generated: Uses Claude Code

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 .../selftest/files/TestMbox.test_bugzilla_entry_format.fail  | 5 ++---
 .../selftest/files/TestMbox.test_bugzilla_entry_format.pass  | 5 ++---
 .../files/TestMbox.test_commit_message_presence.fail         | 5 ++---
 .../files/TestMbox.test_commit_message_presence.pass         | 5 ++---
 .../files/TestMbox.test_commit_message_user_tags.1.pass      | 5 ++---
 .../files/TestMbox.test_commit_message_user_tags.2.pass      | 5 ++---
 .../files/TestMbox.test_commit_message_user_tags.fail        | 5 ++---
 .../patchtest/selftest/files/TestMbox.test_mbox_format.pass  | 5 ++---
 .../selftest/files/TestMbox.test_shortlog_format.fail        | 5 ++---
 .../selftest/files/TestMbox.test_shortlog_format.pass        | 5 ++---
 .../selftest/files/TestMbox.test_shortlog_length.fail        | 5 ++---
 .../selftest/files/TestMbox.test_shortlog_length.pass        | 5 ++---
 .../files/TestMbox.test_signed_off_by_presence.1.fail        | 5 ++---
 .../files/TestMbox.test_signed_off_by_presence.2.fail        | 5 ++---
 .../selftest/files/TestMbox.test_signed_off_by_presence.pass | 5 ++---
 .../selftest/files/TestPatch.test_cve_tag_format.fail        | 5 ++---
 .../selftest/files/TestPatch.test_cve_tag_format.pass        | 5 ++---
 .../files/TestPatch.test_signed_off_by_presence.fail         | 5 ++---
 .../files/TestPatch.test_signed_off_by_presence.pass         | 5 ++---
 19 files changed, 38 insertions(+), 57 deletions(-)
diff mbox series

Patch

diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail
index 6facb8c756..d5e8f898bd 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail
@@ -51,7 +51,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -60,8 +60,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass
index 2f35458b4f..8bbf18d4f7 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass
@@ -51,7 +51,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -60,8 +60,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail
index 6f4e61c0da..479ac14008 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail
@@ -46,7 +46,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -55,8 +55,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass
index 3fbc23fd00..f78acf17f6 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.1.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.1.pass
index 57f2fc8a8e..31b010c327 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.1.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.1.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.2.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.2.pass
index cdae2c3fac..182b96ecdf 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.2.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.2.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.fail
index 9d54af9644..991d82144a 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_user_tags.fail
@@ -49,7 +49,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -58,8 +58,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass
index f06ae11d04..ffea42d831 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail
index c5e4df2549..ac7a233dab 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass
index 4948e26afc..4f1013244d 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail
index 4ed1242821..6008f234db 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass
index ef5066a650..7f5abe2b5c 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail
index 4ede7271ee..7c07489bb8 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail
@@ -49,7 +49,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -58,8 +58,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail
index f7c3f5145a..c4b833d52f 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass
index 2661c1416f..6c6a387275 100644
--- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass
+++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail
index f64f2a40b0..20978c2d07 100644
--- a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail
+++ b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass
index 3819487041..1213c6e732 100644
--- a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass
+++ b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail
index b2d0fab9e3..cd16385012 100644
--- a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail
+++ b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail
@@ -49,7 +49,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -58,8 +58,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1
 
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass
index 2661c1416f..6c6a387275 100644
--- a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass
+++ b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass
@@ -50,7 +50,7 @@  diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/m
 index 2dc352d479e..d937759f157 100644
 --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
 +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
-@@ -3,7 +3,9 @@ SECTION = "examples"
+@@ -3,6 +3,8 @@ SECTION = "examples"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
  
@@ -59,8 +59,7 @@  index 2dc352d479e..d937759f157 100644
 +           file://0001-Fix-CVE-1234-56789.patch \
 +	   "
  
- S = "${WORKDIR}/sources"
- UNPACKDIR = "${S}"
+ S = "${UNPACKDIR}"
 -- 
 2.45.1