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).
101 lines
2.0 KiB
C
101 lines
2.0 KiB
C
// RUN: rm -rf %t
|
|
// RUN: split-file %s %t
|
|
// RUN: %clang_cc1 -fsyntax-only -I %t/include %t/test.c \
|
|
// RUN: -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache
|
|
|
|
// Test when a decl is present in multiple modules through an inclusion of
|
|
// a non-modular header. Make sure such decl is serialized correctly and can be
|
|
// used after deserialization.
|
|
|
|
//--- include/non-modular.h
|
|
#ifndef NON_MODULAR_H
|
|
#define NON_MODULAR_H
|
|
|
|
union TestUnion {
|
|
int x;
|
|
float y;
|
|
};
|
|
|
|
struct ReferenceUnion1 {
|
|
union TestUnion name;
|
|
unsigned versionMajor;
|
|
};
|
|
struct ReferenceUnion2 {
|
|
union TestUnion name;
|
|
unsigned versionMinor;
|
|
};
|
|
|
|
// Test another kind of RecordDecl.
|
|
struct TestStruct {
|
|
int p;
|
|
float q;
|
|
};
|
|
|
|
struct ReferenceStruct1 {
|
|
unsigned fieldA;
|
|
struct TestStruct fieldB;
|
|
};
|
|
|
|
struct ReferenceStruct2 {
|
|
unsigned field1;
|
|
struct TestStruct field2;
|
|
};
|
|
|
|
#endif
|
|
|
|
//--- include/piecewise1-empty.h
|
|
//--- include/piecewise1-initially-hidden.h
|
|
#include <non-modular.h>
|
|
|
|
//--- include/piecewise2-empty.h
|
|
//--- include/piecewise2-initially-hidden.h
|
|
#include <non-modular.h>
|
|
|
|
//--- include/with-multiple-decls.h
|
|
#include <piecewise1-empty.h>
|
|
// Include the non-modular header and resolve a name duplication between decl
|
|
// in non-modular.h and in piecewise1-initially-hidden.h, create a
|
|
// redeclaration chain.
|
|
#include <non-modular.h>
|
|
// Include a decl with a duplicate name again to add more to IdentifierResolver.
|
|
#include <piecewise2-empty.h>
|
|
|
|
//--- include/module.modulemap
|
|
module Piecewise1 {
|
|
module Empty {
|
|
header "piecewise1-empty.h"
|
|
}
|
|
module InitiallyHidden {
|
|
header "piecewise1-initially-hidden.h"
|
|
export *
|
|
}
|
|
}
|
|
|
|
module Piecewise2 {
|
|
module Empty {
|
|
header "piecewise2-empty.h"
|
|
}
|
|
module InitiallyHidden {
|
|
header "piecewise2-initially-hidden.h"
|
|
export *
|
|
}
|
|
}
|
|
|
|
module WithMultipleDecls {
|
|
header "with-multiple-decls.h"
|
|
export *
|
|
}
|
|
|
|
//--- test.c
|
|
#include <with-multiple-decls.h>
|
|
|
|
struct Test {
|
|
int x;
|
|
union TestUnion name;
|
|
};
|
|
|
|
struct Test2 {
|
|
struct TestStruct name;
|
|
float y;
|
|
};
|