ae749ffb23
The v6.0 build-system hardening arc lands 5 of the 10 improvements
proposed in local/docs/BUILD-SYSTEM-IMPROVEMENTS.md. All scripts
have unit tests (62 -> 86, all pass in <1s) and the new 'lint-recipe'
Gitea Actions job runs on every PR.
Per-recipe audit & lint scripts (catch R1/R2 violations BEFORE cook):
* audit-patch-idempotency.py — verifies external patches in
local/patches/ still apply against the upstream pinned rev.
Caught 1 real bug on first run: libdrm/02-redox-dispatch.patch
hunk at xf86drm.c:321 no longer matches libdrm-2.4.125.
* audit-kf6-deps.py — fetches upstream, scans for
find_package(KF6Xxx REQUIRED), compares to recipe deps. Catches
missing + dead dependencies in every kf6-* and qt* recipe.
* classify-cook-failure.py — 17-rule cook-failure classifier.
10-30s diagnosis vs 5-10min manual. exit code is intentionally
inverted (0=novel failure, 1=known fix) for CI signal.
* lint-recipe.py — 7-rule recipe lint: R1-NO-PATCH-FILE,
R1-PATH-SOURCE, R2-INLINE-SED, R2-PATCHES-DIR-UNUSED,
NO-LEGACY-MAKE, R1-LEGACY-APPLY-PATCHES, DEP-NOT-FOUND.
1.1s for 171 recipes (down from 60s+ in v1 via recipe-index
precomputation). Strict mode promotes warnings to errors.
Build-system convenience:
* repair-cook.sh — incremental-build optimizer.
Equivalent to 'repo cook <pkg>' but with a fast-path that
skips configure when CMakeCache.txt is newer than source AND
external patches haven't changed. 30-60s vs 5-10min on KF6
recipes. make repair.<pkg> / make clean-repair.<pkg> targets.
* migrate-kf6-seds-to-patches.sh — migration skeleton for
converting 56 inline 'sed -i' chains across the KF6 recipes
to durable external patches in local/patches/<name>/.
Gitea Actions (host-execution, no Docker):
* .gitea/workflows/build-system.yml — 8-job pipeline:
unit-tests, lint-offline, lint-network (nightly),
lint-recipe (NEW), lint-docs, build-mini, build-full,
smoke (QEMU boot).
* .gitea/RUNNER-SETUP.md — one-time Manjaro/Arch host setup.
Build script hardening:
* build-redbear.sh — when a low-level source (relibc,
kernel, base, bootloader, installer) is newer than its pkgar,
clean build/ and sysroot/ across all recipes too. Low-level
package changes leave autotools packages (pcre2, gettext,
libiconv, ...) with stale configure/libtool scripts referencing
the old runtime, causing 'libtool version mismatch' and
'not a valid libtool object' errors. Cleaning forces
re-configuration; stage/ and source/ are preserved so the
cookbook skips unchanged packages that don't use autotools.
* Makefile — wire lint-cook-failure,
lint-cook-failure-explain, lint-recipe, lint-recipe.%,
lint-recipe.strict, lint-recipe.%.strict, repair.%,
clean-repair.%, test-lint-scripts[-quiet]. Replace the
legacy 'validate-patches' target with a deprecation notice
pointing at validate-sources.
Documentation:
* BUILD-SYSTEM-IMPROVEMENTS.md — mark #2 and #5 DONE; full
implementation notes; updated Make-targets table.
* BUILD-SYSTEM-V6-HARDENING-POSTMORTEM.md (NEW) — 226-line durable
record of the 8-session arc: 32 findings categorized, 5 P0
audit-script bugs fixed, 6 over-broad multi-pattern rules
discovered + fixed, test coverage 86/86 in <1s, 7/10
improvements DONE.
* SCRIPT-BEHAVIOR-MATRIX.md — apply-patches.sh row marked
LEGACY/ARCHIVED; build-redbear.sh row no longer claims to
call it.
* boot-logs/README.md (NEW) — frozen-evidence policy:
'do not edit' rule for REDBEAR-FULL-BOOT-*-RESULTS.md files.
* libdrm/02-redox-dispatch.patch.README (NEW) — 8-step regen
procedure for the broken hunk.
Cleanup:
* local/cache/README.md deleted (1-line placeholder).
* legacy 'make validate-patches' target removed.
Per build-system improvement #5: lint-recipe.py's first run on
the live tree surfaced 1 broken-patch reference (redbear-sessiond),
1 dangling cookbook_apply_patches call (tc), 19 sed -i calls in
sddm (warning — cookbook_apply_patches present, drop-x11.py
migration in progress), 4 sed -i calls in qt6-wayland-smoke
(uncovers the same bug class the libwayland fix prevented).
141 lines
4.8 KiB
Python
141 lines
4.8 KiB
Python
#!/usr/bin/env python3
|
|
"""Smoke tests for audit-kf6-deps.py.
|
|
|
|
Run with:
|
|
python3 -m unittest local/scripts/tests/test_audit_kf6_deps.py
|
|
"""
|
|
import re
|
|
import sys
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
SCRIPTS_DIR = Path(__file__).resolve().parent.parent
|
|
sys.path.insert(0, str(SCRIPTS_DIR))
|
|
|
|
import importlib.util # noqa: E402
|
|
_spec = importlib.util.spec_from_file_location(
|
|
"akd", SCRIPTS_DIR / "audit-kf6-deps.py"
|
|
)
|
|
assert _spec is not None and _spec.loader is not None
|
|
akd = importlib.util.module_from_spec(_spec)
|
|
_spec.loader.exec_module(akd)
|
|
|
|
|
|
class TestKF6RegexForms(unittest.TestCase):
|
|
"""The four find_package forms must all be recognized."""
|
|
|
|
def test_form_1_direct_namespace(self):
|
|
text = "find_package(KF6::Foo REQUIRED)"
|
|
self.assertIn("KF6::Foo", _scan(text))
|
|
|
|
def test_form_2_components_block(self):
|
|
text = "find_package(KF6 6.26.0 REQUIRED COMPONENTS Foo Bar)"
|
|
found = _scan(text)
|
|
self.assertIn("KF6::Foo", found)
|
|
self.assertIn("KF6::Bar", found)
|
|
|
|
def test_form_3_dominant_named(self):
|
|
text = "find_package(KF6KDED ${VER} REQUIRED)"
|
|
self.assertIn("KF6::KDED", _scan(text))
|
|
|
|
def test_form_4_plain_name(self):
|
|
text = "find_package(KF6 XmlRpc REQUIRED)"
|
|
self.assertIn("KF6::XmlRpc", _scan(text))
|
|
|
|
def test_self_reference_kf6kf6_filtered(self):
|
|
text = "find_package(KF6KF6Foo REQUIRED)"
|
|
# KF6KF6Foo slices to KF6Foo — the "Foo" remains valid.
|
|
# But "find_package(KF6KF6 ${VAR})" is filtered.
|
|
text2 = "NAMESPACE KF6::"
|
|
# Direct regex matches "KF6::" (no Foo); NAMED doesn't match.
|
|
# Just confirm no crash + empty-ish result.
|
|
self.assertIsInstance(_scan(text2), set)
|
|
|
|
def test_qt6_modules(self):
|
|
text = "find_package(Qt6Core REQUIRED) find_package(Qt6Qml QUIET)"
|
|
# Qt6Core -> qtbase, Qt6Qml -> qtdeclarative
|
|
qt6 = _scan_qt6(text)
|
|
self.assertIn("Qt6Core", qt6)
|
|
self.assertIn("Qt6Qml", qt6)
|
|
deps = {akd.normalize_dep_name(c) for c in qt6}
|
|
self.assertIn("qtbase", deps)
|
|
self.assertIn("qtdeclarative", deps)
|
|
|
|
|
|
class TestNormalizeDepName(unittest.TestCase):
|
|
def test_kf6_kio(self):
|
|
self.assertEqual(akd.normalize_dep_name("KF6::KIO"), "kf6-kio")
|
|
|
|
def test_kf6_kcmutils_override(self):
|
|
self.assertEqual(akd.normalize_dep_name("KF6::KCMUtils"), "kf6-kcmutils")
|
|
|
|
def test_kf6_kded6_override(self):
|
|
self.assertEqual(akd.normalize_dep_name("KF6::KDED"), "kf6-kded6")
|
|
|
|
def test_qt6guifrivate_qtbase(self):
|
|
self.assertEqual(akd.normalize_dep_name("Qt6GuiPrivate"), "qtbase")
|
|
|
|
def test_qt6concurrent_qtbase(self):
|
|
self.assertEqual(akd.normalize_dep_name("Qt6Concurrent"), "qtbase")
|
|
|
|
|
|
class TestDiscoverSkipsWIP(unittest.TestCase):
|
|
def test_wip_path_excluded(self):
|
|
"""Per local/AGENTS.md local-over-WIP policy: WIP paths skipped."""
|
|
# We can't easily test discover_kf6_recipes without filesystem state,
|
|
# but we can inspect the function source for the wip-skip clause.
|
|
import inspect
|
|
src = inspect.getsource(akd.discover_kf6_recipes)
|
|
self.assertIn('"wip"', src)
|
|
self.assertIn("if \"wip\" in recipe_toml.parts", src)
|
|
|
|
|
|
class TestNoFetchHonesty(unittest.TestCase):
|
|
"""--no-fetch must produce exit 2 (not 0) when every entry is skipped."""
|
|
|
|
def test_no_fetch_json_exits_2(self):
|
|
import subprocess
|
|
rc = subprocess.run(
|
|
["python3", str(SCRIPTS_DIR / "audit-kf6-deps.py"),
|
|
"--no-fetch", "--json"],
|
|
capture_output=True, text=True,
|
|
).returncode
|
|
self.assertEqual(rc, 2,
|
|
f"expected 2 (all-skipped), got {rc}; stdout: "
|
|
f"{subprocess.run.__name__}")
|
|
|
|
|
|
def _scan(text):
|
|
"""Run scan_source logic on a synthetic text blob (KF6 only)."""
|
|
kf6 = set()
|
|
for m in akd.KF6_DIRECT_RE.finditer(text):
|
|
kf6.add(m.group(1))
|
|
for m in akd.KF6_COMPONENTS_BLOCK_RE.finditer(text):
|
|
for tok in akd.KF6_COMPONENT_TOKEN_RE.findall(m.group(0)):
|
|
if tok in ("REQUIRED", "QUIET", "COMPONENTS", "CONFIG",
|
|
"VERSION", "EXACT", "QUIETLY", "MODULE", "KF6"):
|
|
continue
|
|
kf6.add(f"KF6::{tok}")
|
|
for m in akd.KF6_NAMED_RE.finditer(text):
|
|
rest = m.group(1)[len("KF6"):]
|
|
if rest.startswith("KF6") or not rest:
|
|
continue
|
|
kf6.add(f"KF6::{rest}")
|
|
for m in akd.KF6_PLAIN_NAME_RE.finditer(text):
|
|
kf6.add(f"KF6::{m.group(1)}")
|
|
return kf6
|
|
|
|
|
|
def _scan_qt6(text):
|
|
"""Run scan_source Qt6 logic on a synthetic text blob."""
|
|
qt6 = set()
|
|
for m in akd.QT6_COMPONENT_RE.finditer(text):
|
|
qt6.add(f"Qt6{m.group(1)}")
|
|
if akd.QT6_GENERIC_RE.search(text):
|
|
qt6.add("Qt6Core")
|
|
return qt6
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|