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).
67 lines
3.5 KiB
Objective-C
67 lines
3.5 KiB
Objective-C
// RUN: rm -rf %t
|
|
|
|
// Set up directories
|
|
// RUN: mkdir -p %t/APINotes
|
|
// RUN: cp %S/Inputs/APINotes/SomeOtherKit.apinotes %t/APINotes/SomeOtherKit.apinotes
|
|
// RUN: mkdir -p %t/Frameworks
|
|
// RUN: cp -r %S/Inputs/Frameworks/SomeOtherKit.framework %t/Frameworks
|
|
|
|
// First build: check that 'methodB' is unavailable but 'methodA' is available.
|
|
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -Rmodule-build -fmodules-cache-path=%t/ModulesCache -iapinotes-modules %t/APINotes -F %t/Frameworks %s > %t/before.log 2>&1
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODB %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-REBUILD %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-ONE-ERROR %s < %t/before.log
|
|
|
|
// Do it again; now we're using caches.
|
|
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -Rmodule-build -fmodules-cache-path=%t/ModulesCache -iapinotes-modules %t/APINotes -F %t/Frameworks %s > %t/before.log 2>&1
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODB %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-WITHOUT-REBUILD %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-ONE-ERROR %s < %t/before.log
|
|
|
|
// Add a blank line to the header to force the module to rebuild, without
|
|
// (yet) changing API notes.
|
|
// RUN: echo >> %t/Frameworks/SomeOtherKit.framework/Headers/SomeOtherKit.h
|
|
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -Rmodule-build -fmodules-cache-path=%t/ModulesCache -iapinotes-modules %t/APINotes -F %t/Frameworks %s > %t/before.log 2>&1
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODB %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-REBUILD %s < %t/before.log
|
|
// RUN: FileCheck -check-prefix=CHECK-ONE-ERROR %s < %t/before.log
|
|
|
|
// Change the API notes file, after the module has rebuilt once.
|
|
// RUN: chmod u+w %t/APINotes/SomeOtherKit.apinotes
|
|
// RUN: echo ' - Selector: "methodA"' >> %t/APINotes/SomeOtherKit.apinotes
|
|
// RUN: echo ' MethodKind: Instance' >> %t/APINotes/SomeOtherKit.apinotes
|
|
// RUN: echo ' Availability: none' >> %t/APINotes/SomeOtherKit.apinotes
|
|
// RUN: echo ' AvailabilityMsg: "not here either"' >> %t/APINotes/SomeOtherKit.apinotes
|
|
|
|
// Build again: check that both methods are now unavailable and that the module rebuilt.
|
|
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -Rmodule-build -fmodules-cache-path=%t/ModulesCache -iapinotes-modules %t/APINotes -F %t/Frameworks %s > %t/after.log 2>&1
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODA %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODB %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-REBUILD %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-TWO-ERRORS %s < %t/after.log
|
|
|
|
// Run the build again: check that both methods are now unavailable
|
|
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -Rmodule-build -fmodules-cache-path=%t/ModulesCache -iapinotes-modules %t/APINotes -F %t/Frameworks %s > %t/after.log 2>&1
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODA %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-METHODB %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-WITHOUT-REBUILD %s < %t/after.log
|
|
// RUN: FileCheck -check-prefix=CHECK-TWO-ERRORS %s < %t/after.log
|
|
|
|
@import SomeOtherKit;
|
|
|
|
void test(A *a) {
|
|
// CHECK-METHODA: error: 'methodA' is unavailable: not here either
|
|
[a methodA];
|
|
|
|
// CHECK-METHODB: error: 'methodB' is unavailable: anything but this
|
|
[a methodB];
|
|
}
|
|
|
|
// CHECK-REBUILD: remark: building module{{.*}}SomeOtherKit
|
|
|
|
// CHECK-WITHOUT-REBUILD-NOT: remark: building module{{.*}}SomeOtherKit
|
|
|
|
// CHECK-ONE-ERROR: 1 error generated.
|
|
// CHECK-TWO-ERRORS: 2 errors generated.
|
|
|