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).
117 lines
3.8 KiB
C
117 lines
3.8 KiB
C
// This test verifies that the modules visible to the translation unit are computed in dependency scanning.
|
|
// "client" in the first scan represents the translation unit that imports an explicit submodule,
|
|
// that only exports one other module.
|
|
// In the second scan, the translation unit that imports an explicit submodule,
|
|
// that exports an additional module.
|
|
// Thus, the dependencies of the top level module for the submodule always differ from what is visible to the TU.
|
|
|
|
// RUN: rm -rf %t
|
|
// RUN: split-file %s %t
|
|
// RUN: sed -e "s|DIR|%/t|g" %t/compile-commands.json.in > %t/compile-commands.json
|
|
// RUN: clang-scan-deps -emit-visible-modules -compilation-database %t/compile-commands.json \
|
|
// RUN: -j 1 -format experimental-full 2>&1 > %t/result-first-scan.json
|
|
// RUN: cat %t/result-first-scan.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t --check-prefix=SINGLE
|
|
|
|
/// Re-run scan with different module map for direct dependency.
|
|
// RUN: mv %t/A_with_visible_export.modulemap %t/Sysroot/usr/include/A/module.modulemap
|
|
// RUN: clang-scan-deps -emit-visible-modules -compilation-database %t/compile-commands.json \
|
|
// RUN: -j 1 -format experimental-full 2>&1 > %t/result.json
|
|
// RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t --check-prefix=MULTIPLE
|
|
|
|
// RUN: %deps-to-rsp %t/result.json --module-name=transitive > %t/transitive.rsp
|
|
// RUN: %deps-to-rsp %t/result.json --module-name=visible > %t/visible.rsp
|
|
// RUN: %deps-to-rsp %t/result.json --module-name=invisible > %t/invisible.rsp
|
|
// RUN: %deps-to-rsp %t/result.json --module-name=A > %t/A.rsp
|
|
// RUN: %deps-to-rsp %t/result.json --tu-index=0 > %t/tu.rsp
|
|
|
|
// RUN: %clang @%t/transitive.rsp
|
|
// RUN: %clang @%t/visible.rsp
|
|
// RUN: %clang @%t/invisible.rsp
|
|
// RUN: %clang @%t/A.rsp
|
|
|
|
/// Verify compilation & scan agree with each other.
|
|
// RUN: not %clang @%t/tu.rsp -o %t/blah.o 2>&1 | FileCheck %s --check-prefix=COMPILE
|
|
|
|
// SINGLE: "visible-clang-modules": [
|
|
// SINGLE-NEXT: "A"
|
|
// SINGLE-NEXT: ]
|
|
|
|
// MULTIPLE: "visible-clang-modules": [
|
|
// MULTIPLE-NEXT: "A",
|
|
// MULTIPLE-NEXT: "visible"
|
|
// MULTIPLE-NEXT: ]
|
|
|
|
// COMPILE-NOT: 'visible_t' must be declared before it is used
|
|
// COMPILE: 'transitive_t' must be declared before it is used
|
|
// COMPILE: 'invisible_t' must be declared before it is used
|
|
|
|
//--- compile-commands.json.in
|
|
[
|
|
{
|
|
"directory": "DIR",
|
|
"command": "clang -c DIR/client.c -isysroot DIR/Sysroot -IDIR/Sysroot/usr/include -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-module-maps",
|
|
"file": "DIR/client.c"
|
|
}
|
|
]
|
|
|
|
//--- Sysroot/usr/include/A/module.modulemap
|
|
module A {
|
|
explicit module visibleToTU {
|
|
header "visibleToTU.h"
|
|
}
|
|
explicit module invisibleToTU {
|
|
header "invisibleToTU.h"
|
|
}
|
|
}
|
|
|
|
//--- A_with_visible_export.modulemap
|
|
module A {
|
|
explicit module visibleToTU {
|
|
header "visibleToTU.h"
|
|
export visible
|
|
}
|
|
explicit module invisibleToTU {
|
|
header "invisibleToTU.h"
|
|
}
|
|
}
|
|
|
|
//--- Sysroot/usr/include/A/visibleToTU.h
|
|
#include <visible/visible.h>
|
|
typedef int A_visibleToTU;
|
|
|
|
//--- Sysroot/usr/include/A/invisibleToTU.h
|
|
#include <invisible/invisible.h>
|
|
typedef int A_invisibleToTU;
|
|
|
|
//--- Sysroot/usr/include/invisible/module.modulemap
|
|
module invisible {
|
|
umbrella "."
|
|
}
|
|
|
|
//--- Sysroot/usr/include/invisible/invisible.h
|
|
typedef int invisible_t;
|
|
|
|
//--- Sysroot/usr/include/visible/module.modulemap
|
|
module visible {
|
|
umbrella "."
|
|
}
|
|
|
|
//--- Sysroot/usr/include/visible/visible.h
|
|
#include <transitive/transitive.h>
|
|
typedef int visible_t;
|
|
|
|
//--- Sysroot/usr/include/transitive/module.modulemap
|
|
module transitive {
|
|
umbrella "."
|
|
}
|
|
|
|
//--- Sysroot/usr/include/transitive/transitive.h
|
|
typedef int transitive_t;
|
|
|
|
//--- client.c
|
|
#include <A/visibleToTU.h>
|
|
visible_t foo_v(void);
|
|
// Both decls are not visible, thus should fail to actually compile.
|
|
transitive_t foo_t(void);
|
|
invisible_t foo_i(void);
|