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).
76 lines
2.2 KiB
C
76 lines
2.2 KiB
C
// This test checks that __has_include(<FW/PrivateHeader.h>) in a module does
|
|
// not clobber #include <FW/PrivateHeader.h> in importers of said module.
|
|
|
|
// RUN: rm -rf %t
|
|
// RUN: split-file %s %t
|
|
|
|
//--- cdb.json.template
|
|
[{
|
|
"file": "DIR/tu.c",
|
|
"directory": "DIR",
|
|
"command": "clang DIR/tu.c -fmodules -fmodules-cache-path=DIR/cache -I DIR/modules -F DIR/frameworks -o DIR/tu.o"
|
|
}]
|
|
|
|
//--- frameworks/FW.framework/Modules/module.private.modulemap
|
|
framework module FW_Private {
|
|
umbrella header "A.h"
|
|
module * { export * }
|
|
}
|
|
//--- frameworks/FW.framework/PrivateHeaders/A.h
|
|
#include <FW/B.h>
|
|
//--- frameworks/FW.framework/PrivateHeaders/B.h
|
|
#include "dependency.h"
|
|
|
|
//--- modules/module.modulemap
|
|
module Poison { header "poison.h" }
|
|
module Import { header "import.h" }
|
|
module Dependency { header "dependency.h" }
|
|
//--- modules/poison.h
|
|
#if __has_include(<FW/B.h>)
|
|
#define HAS_B 1
|
|
#else
|
|
#define HAS_B 0
|
|
#endif
|
|
//--- modules/import.h
|
|
#include <FW/B.h>
|
|
//--- modules/dependency.h
|
|
|
|
//--- tu.c
|
|
#include "poison.h"
|
|
|
|
#if __has_include(<FW/B.h>)
|
|
#endif
|
|
|
|
#include "import.h"
|
|
|
|
#include <FW/B.h>
|
|
|
|
// RUN: sed -e "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json
|
|
// RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full > %t/deps.json
|
|
// RUN: cat %t/deps.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t
|
|
|
|
// Let's check that the TU actually depends on `FW_Private` (and does not treat FW/B.h as textual).
|
|
// CHECK: {
|
|
// CHECK: "translation-units": [
|
|
// CHECK-NEXT: {
|
|
// CHECK-NEXT: "commands": [
|
|
// CHECK-NEXT: {
|
|
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
|
|
// CHECK-NEXT: "clang-module-deps": [
|
|
// CHECK-NEXT: {
|
|
// CHECK-NEXT: "context-hash": "{{.*}}",
|
|
// CHECK-NEXT: "module-name": "FW_Private"
|
|
// CHECK-NEXT: }
|
|
// CHECK: ],
|
|
// CHECK-NEXT: "command-line": [
|
|
// CHECK: ],
|
|
// CHECK: "file-deps": [
|
|
// CHECK-NEXT: "[[PREFIX]]/tu.c"
|
|
// CHECK-NEXT: ],
|
|
// CHECK-NEXT: "input-file": "[[PREFIX]]/tu.c"
|
|
// CHECK-NEXT: }
|
|
// CHECK: ]
|
|
// CHECK: }
|
|
// CHECK: ]
|
|
// CHECK: }
|