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).
199 lines
8.6 KiB
C
199 lines
8.6 KiB
C
// Unsupported on AIX because we don't support the requisite "__clangast"
|
|
// section in XCOFF yet.
|
|
// UNSUPPORTED: target={{.*}}-aix{{.*}}
|
|
|
|
// RUN: rm -rf %t && mkdir %t
|
|
// RUN: cp %S/Inputs/modules-pch/* %t
|
|
|
|
// Scan dependencies of the PCH:
|
|
//
|
|
// RUN: rm -f %t/cdb_pch.json
|
|
// RUN: sed "s|DIR|%/t|g" %S/Inputs/modules-pch/cdb_pch.json > %t/cdb_pch.json
|
|
// RUN: clang-scan-deps -compilation-database %t/cdb_pch.json -format experimental-full \
|
|
// RUN: -module-files-dir %t/build > %t/result_pch.json
|
|
// RUN: cat %t/result_pch.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t -check-prefix=CHECK-PCH
|
|
//
|
|
// Check we didn't build the PCH during dependency scanning.
|
|
// RUN: not cat %/t/pch.h.pch
|
|
//
|
|
// CHECK-PCH: {
|
|
// CHECK-PCH-NEXT: "modules": [
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "clang-module-deps": [],
|
|
// CHECK-PCH-NEXT: "clang-modulemap-file": "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "command-line": [
|
|
// CHECK-PCH: ],
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_COMMON_1:.*]]",
|
|
// CHECK-PCH-NEXT: "file-deps": [
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/mod_common_1.h"
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "link-libraries": [],
|
|
// CHECK-PCH-NEXT: "name": "ModCommon1"
|
|
// CHECK-PCH-NEXT: },
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "clang-module-deps": [],
|
|
// CHECK-PCH-NEXT: "clang-modulemap-file": "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "command-line": [
|
|
// CHECK-PCH: ],
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_COMMON_2:.*]]",
|
|
// CHECK-PCH-NEXT: "file-deps": [
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/mod_common_2.h"
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "link-libraries": [],
|
|
// CHECK-PCH-NEXT: "name": "ModCommon2"
|
|
// CHECK-PCH-NEXT: },
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "clang-module-deps": [
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_COMMON_2]]",
|
|
// CHECK-PCH-NEXT: "module-name": "ModCommon2"
|
|
// CHECK-PCH-NEXT: }
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "clang-modulemap-file": "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "command-line": [
|
|
// CHECK-PCH: ],
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_PCH:.*]]",
|
|
// CHECK-PCH-NEXT: "file-deps": [
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/module.modulemap",
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/mod_pch.h"
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "link-libraries": [],
|
|
// CHECK-PCH-NEXT: "name": "ModPCH"
|
|
// CHECK-PCH-NEXT: }
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "translation-units": [
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH: "clang-context-hash": "[[HASH_PCH:.*]]",
|
|
// CHECK-PCH-NEXT: "clang-module-deps": [
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_COMMON_1]]",
|
|
// CHECK-PCH-NEXT: "module-name": "ModCommon1"
|
|
// CHECK-PCH-NEXT: },
|
|
// CHECK-PCH-NEXT: {
|
|
// CHECK-PCH-NEXT: "context-hash": "[[HASH_MOD_PCH]]",
|
|
// CHECK-PCH-NEXT: "module-name": "ModPCH"
|
|
// CHECK-PCH-NEXT: }
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "command-line": [
|
|
// CHECK-PCH: ],
|
|
// CHECK-PCH: "file-deps": [
|
|
// CHECK-PCH-NEXT: "[[PREFIX]]/pch.h"
|
|
// CHECK-PCH-NEXT: ],
|
|
// CHECK-PCH-NEXT: "input-file": "[[PREFIX]]/pch.h"
|
|
// CHECK-PCH-NEXT: }
|
|
|
|
// Explicitly build the PCH:
|
|
//
|
|
// RUN: %deps-to-rsp %t/result_pch.json --module-name=ModCommon1 > %t/mod_common_1.cc1.rsp
|
|
// RUN: %deps-to-rsp %t/result_pch.json --module-name=ModCommon2 > %t/mod_common_2.cc1.rsp
|
|
// RUN: %deps-to-rsp %t/result_pch.json --module-name=ModPCH > %t/mod_pch.cc1.rsp
|
|
// RUN: %deps-to-rsp %t/result_pch.json --tu-index=0 > %t/pch.rsp
|
|
//
|
|
// RUN: %clang @%t/mod_common_1.cc1.rsp
|
|
// RUN: %clang @%t/mod_common_2.cc1.rsp
|
|
// RUN: %clang @%t/mod_pch.cc1.rsp
|
|
// RUN: %clang @%t/pch.rsp
|
|
|
|
// Scan dependencies of the TU:
|
|
//
|
|
// RUN: rm -f %t/cdb_tu.json
|
|
// RUN: sed "s|DIR|%/t|g" %S/Inputs/modules-pch/cdb_tu.json > %t/cdb_tu.json
|
|
// RUN: clang-scan-deps -compilation-database %t/cdb_tu.json -format experimental-full \
|
|
// RUN: -module-files-dir %t/build > %t/result_tu.json
|
|
// RUN: cat %t/result_tu.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t -check-prefix=CHECK-TU
|
|
//
|
|
// CHECK-TU: {
|
|
// CHECK-TU-NEXT: "modules": [
|
|
// CHECK-TU-NEXT: {
|
|
// CHECK-TU-NEXT: "clang-module-deps": [],
|
|
// CHECK-TU-NEXT: "clang-modulemap-file": "[[PREFIX]]/module.modulemap",
|
|
// CHECK-TU-NEXT: "command-line": [
|
|
// CHECK-TU: ],
|
|
// CHECK-TU-NEXT: "context-hash": "[[HASH_MOD_TU:.*]]",
|
|
// CHECK-TU-NEXT: "file-deps": [
|
|
// CHECK-TU-NEXT: "[[PREFIX]]/module.modulemap",
|
|
// CHECK-TU-NEXT: "[[PREFIX]]/mod_tu.h"
|
|
// CHECK-TU-NEXT: ],
|
|
// CHECK-TU-NEXT: "link-libraries": [],
|
|
// CHECK-TU-NEXT: "name": "ModTU"
|
|
// CHECK-TU-NEXT: }
|
|
// CHECK-TU-NEXT: ],
|
|
// CHECK-TU-NEXT: "translation-units": [
|
|
// CHECK-TU-NEXT: {
|
|
// CHECK-TU: "clang-context-hash": "[[HASH_TU:.*]]",
|
|
// CHECK-TU-NEXT: "clang-module-deps": [
|
|
// CHECK-TU-NEXT: {
|
|
// CHECK-TU-NEXT: "context-hash": "[[HASH_MOD_TU]]",
|
|
// CHECK-TU-NEXT: "module-name": "ModTU"
|
|
// CHECK-TU-NEXT: }
|
|
// CHECK-TU-NEXT: ],
|
|
// CHECK-TU-NEXT: "command-line": [
|
|
// CHECK-TU: ],
|
|
// CHECK-TU: "file-deps": [
|
|
// CHECK-TU-NEXT: "[[PREFIX]]/tu.c",
|
|
// CHECK-TU-NEXT: "[[PREFIX]]/pch.h.pch"
|
|
// CHECK-TU-NEXT: ],
|
|
// CHECK-TU-NEXT: "input-file": "[[PREFIX]]/tu.c"
|
|
// CHECK-TU-NEXT: }
|
|
|
|
// Explicitly build the TU:
|
|
//
|
|
// RUN: %deps-to-rsp %t/result_tu.json --module-name=ModTU > %t/mod_tu.cc1.rsp
|
|
// RUN: %deps-to-rsp %t/result_tu.json --tu-index=0 > %t/tu.rsp
|
|
//
|
|
// RUN: %clang @%t/mod_tu.cc1.rsp
|
|
// RUN: %clang @%t/tu.rsp
|
|
|
|
// Scan dependencies of the TU that has common modules with the PCH:
|
|
//
|
|
// RUN: rm -f %t/cdb_tu_with_common.json
|
|
// RUN: sed "s|DIR|%/t|g" %S/Inputs/modules-pch/cdb_tu_with_common.json > %t/cdb_tu_with_common.json
|
|
// RUN: clang-scan-deps -compilation-database %t/cdb_tu_with_common.json -format experimental-full \
|
|
// RUN: -module-files-dir %t/build > %t/result_tu_with_common.json
|
|
// RUN: cat %t/result_tu_with_common.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t -check-prefix=CHECK-TU-WITH-COMMON
|
|
//
|
|
// CHECK-TU-WITH-COMMON: {
|
|
// CHECK-TU-WITH-COMMON-NEXT: "modules": [
|
|
// CHECK-TU-WITH-COMMON-NEXT: {
|
|
// CHECK-TU-WITH-COMMON-NEXT: "clang-module-deps": [],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "clang-modulemap-file": "[[PREFIX]]/module.modulemap",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "command-line": [
|
|
// CHECK-TU-WITH-COMMON: ],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "context-hash": "[[HASH_MOD_TU_WITH_COMMON:.*]]",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "file-deps": [
|
|
// CHECK-TU-WITH-COMMON-NEXT: "[[PREFIX]]/module.modulemap",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "[[PREFIX]]/mod_tu_with_common.h"
|
|
// CHECK-TU-WITH-COMMON-NEXT: ],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "link-libraries": [],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "name": "ModTUWithCommon"
|
|
// CHECK-TU-WITH-COMMON-NEXT: }
|
|
// CHECK-TU-WITH-COMMON-NEXT: ],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "translation-units": [
|
|
// CHECK-TU-WITH-COMMON-NEXT: {
|
|
// CHECK-TU-WITH-COMMON: "clang-context-hash": "[[HASH_TU_WITH_COMMON:.*]]",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "clang-module-deps": [
|
|
// CHECK-TU-WITH-COMMON-NEXT: {
|
|
// CHECK-TU-WITH-COMMON-NEXT: "context-hash": "[[HASH_MOD_TU_WITH_COMMON]]",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "module-name": "ModTUWithCommon"
|
|
// CHECK-TU-WITH-COMMON-NEXT: }
|
|
// CHECK-TU-WITH-COMMON-NEXT: ],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "command-line": [
|
|
// CHECK-TU-WITH-COMMON: "-fmodule-file=[[PREFIX]]/build/{{.*}}/ModCommon2-{{.*}}.pcm"
|
|
// CHECK-TU-WITH-COMMON: ],
|
|
// CHECK-TU-WITH-COMMON: "file-deps": [
|
|
// CHECK-TU-WITH-COMMON-NEXT: "[[PREFIX]]/tu_with_common.c",
|
|
// CHECK-TU-WITH-COMMON-NEXT: "[[PREFIX]]/pch.h.pch"
|
|
// CHECK-TU-WITH-COMMON-NEXT: ],
|
|
// CHECK-TU-WITH-COMMON-NEXT: "input-file": "[[PREFIX]]/tu_with_common.c"
|
|
// CHECK-TU-WITH-COMMON-NEXT: }
|
|
|
|
// Explicitly build the TU that has common modules with the PCH:
|
|
//
|
|
// RUN: %deps-to-rsp %t/result_tu_with_common.json --module-name=ModTUWithCommon > %t/mod_tu_with_common.cc1.rsp
|
|
// RUN: %deps-to-rsp %t/result_tu_with_common.json --tu-index=0 > %t/tu_with_common.rsp
|
|
//
|
|
// RUN: %clang @%t/mod_tu_with_common.cc1.rsp
|
|
// RUN: %clang @%t/tu_with_common.rsp
|