vasilito
cb424d7448
verify-patch-sanity.py validates every active recipe .patch has internally- consistent hunk line counts — catching the 'malformed patch at line N' failure at commit/CI/preflight time instead of hours into a cook. This cycle hit that class three times (qtwaylandscanner, sddm, xwayland), each only discovered when cookbook tried to apply the patch. Running it across the repo found 29 latent malformed patches (validated against GNU patch: e.g. relibc/P3-sysv-ipc reproduces 'malformed patch at line 22'). They were harmless only because they sit in vendored recipes (baked, not re- applied) — but would fail on any version-bump re-derivation. --fix recounts the hunk headers (body untouched) and repaired all 29. Wired into build-preflight.sh (Phase 1.0D) and redbear-ci.yml, with a unit test (test-patch-sanity.sh). Skips archived/legacy trees and unvalidatable formats (empty placeholders, bare-@@ git hunks).
83 lines
3.4 KiB
Plaintext
83 lines
3.4 KiB
Plaintext
; RUN: FileCheck -input-file %s %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD1 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR1 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD2 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR2 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD3 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR3 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD4 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR4 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD5 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR5 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD6 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR6 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD7 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR7 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD8 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR8 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD9 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR9 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD10 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR10 %s
|
|
; RUN: %ProtectFileCheckOutput not FileCheck -check-prefix BAD11 -input-file %s %s 2>&1 | FileCheck -check-prefix ERR11 %s
|
|
13
|
|
14 aaa
|
|
15 bbb
|
|
16 ccc
|
|
17 CHECK: [[@LINE-3]] {{a}}aa
|
|
18 CHECK: [[@LINE-3]] {{b}}bb
|
|
19 CHECK: [[@LINE-3]] {{c}}cc
|
|
20 foobar
|
|
21 CHECK: [[@LINE-1]] {{foo}}bar
|
|
22
|
|
23 arst CHECK: [[@LINE]] {{a}}rst
|
|
24
|
|
25 BAD1: [[@LINE:cant-have-regex]]
|
|
26 ERR1: line-count.txt:[[#@LINE-1]]:12: error: invalid name in string variable definition
|
|
27
|
|
28 BAD2: [[ @LINE]]
|
|
29 ERR2: line-count.txt:[[#@LINE-1]]:12: error: unexpected whitespace
|
|
30
|
|
31 BAD3: [[@LINE ]]
|
|
32 ERR3: line-count.txt:[[#@LINE-1]]:17: error: unexpected whitespace
|
|
33
|
|
34 BAD4: [[ @LINE-1]]
|
|
35 ERR4: line-count.txt:[[#@LINE-1]]:12: error: unexpected whitespace
|
|
36
|
|
37 BAD5: [[@LINE -1]]
|
|
38 ERR5: line-count.txt:[[#@LINE-1]]:17: error: unexpected whitespace
|
|
39
|
|
40 BAD6: [[@LINE- 1]]
|
|
41 ERR6: line-count.txt:[[#@LINE-1]]:18: error: unexpected whitespace
|
|
42
|
|
43 BAD7: [[@LINE-1 ]]
|
|
44 ERR7: line-count.txt:[[#@LINE-1]]:19: error: unexpected whitespace
|
|
45
|
|
46 BAD8: [[@LIN]]
|
|
47 ERR8: line-count.txt:[[#@LINE-1]]:12: error: invalid pseudo numeric variable '@LIN'
|
|
48
|
|
49 BAD9: [[@LINE*2]]
|
|
50 ERR9: line-count.txt:[[#@LINE-1]]:17: error: unsupported operation '*'
|
|
51
|
|
52 BAD10: [[@LINE-x]]
|
|
53 ERR10: line-count.txt:[[#@LINE-1]]:19: error: invalid operand format
|
|
54 ERR10-NEXT: 52 {{B}}AD10: {{\[\[@LINE-x\]\]}}
|
|
55 ERR10-NEXT: {{^}} ^{{$}}
|
|
56
|
|
57 BAD11: [[@LINE-1x]]
|
|
58 ERR11: line-count.txt:[[#@LINE-1]]:20: error: unexpected characters at end of expression 'x'
|
|
59
|
|
; RUN: %ProtectFileCheckOutput \
|
|
; RUN: not FileCheck -check-prefix BAD12 -input-file %s %s 2>&1 \
|
|
; RUN: | FileCheck -check-prefix ERR12 %s
|
|
63
|
|
64 BAD12: [[#@LINE-1]] NOT HERE
|
|
65 ERR12: note: with "@LINE-1" equal to "63"
|
|
66
|
|
; RUN: %ProtectFileCheckOutput \
|
|
; RUN: not FileCheck --check-prefix BAD13 --input-file %s %s 2>&1 \
|
|
; RUN: | FileCheck --check-prefix ERR13 %s
|
|
70
|
|
71 BAD13: [[@LINE-0xA]]
|
|
72 ERR13: line-count.txt:[[#@LINE-1]]:20: error: unexpected characters at end of expression 'xA'
|
|
73
|
|
74 CHECK: [[#@LINE]] CHECK
|
|
75 CHECK: [[# @LINE]] CHECK
|
|
76 CHECK: [[# @LINE ]] CHECK
|
|
77
|
|
78 CHECK: [[#@LINE-1]]
|
|
79 CHECK: [[# @LINE-1]] CHECK
|
|
80 CHECK: [[# @LINE -1]] CHECK
|
|
81 CHECK: [[# @LINE - 1]] CHECK
|
|
82 CHECK: [[# @LINE - 1 ]] CHECK
|