mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-13 23:10:49 +01:00
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
156 lines
5.3 KiB
Bash
Executable File
156 lines
5.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# lib/tests/arch_desktop_harness.sh — shared setup for the arch desktop
|
|
# optimization lib tests (arch_sysctl.sh, arch_cpu.sh, arch_hardware.sh).
|
|
#
|
|
# Sourced, not executed. Builds on lib_test_core.sh and adds the pieces these
|
|
# three libs read from their entry script, optimize_arch_desktop.sh:
|
|
#
|
|
# * DRY_RUN, AGGRESSIVE, TWEAKS_APPLIED and TWEAKS_SKIPPED;
|
|
# * apply_tweak, redefined verbatim from the entry script -- it lives there
|
|
# rather than in any lib, the same arrangement arch_perf_harness.sh
|
|
# handles with add_finding/add_action;
|
|
# * the real log_*/has_cmd helpers, via lib/common.sh.
|
|
#
|
|
# NOT to be confused with arch_perf_harness.sh, which serves a different entry
|
|
# script (diagnose_arch_performance.sh) and a different set of libs. The two
|
|
# families were mis-grouped in an earlier handoff; the distinct names are the
|
|
# fix for that.
|
|
#
|
|
# Every absolute write target of these libs is behind an override defaulting
|
|
# to the real location, because run_all.sh runs UN-jailed in ci_mirror.sh and
|
|
# in CI, where a bind mount would protect nothing.
|
|
set -uo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
FIXES_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)"
|
|
REPO_ROOT="$(cd "${FIXES_DIR}/../.." && pwd)"
|
|
|
|
# shellcheck source=lib_test_core.sh
|
|
. "${SCRIPT_DIR}/lib_test_core.sh"
|
|
|
|
# shellcheck source=../../../lib/common.sh
|
|
. "${REPO_ROOT}/linux_configuration/lib/common.sh"
|
|
|
|
# --- globals and helpers owned by optimize_arch_desktop.sh ------------------
|
|
|
|
# Read by the libs under test, never by this harness, so static analysis
|
|
# cannot see the use; export makes the intent explicit.
|
|
export SYSCTL_DROPIN_DIR="${TEST_TMPDIR}/sysctl.d"
|
|
export UDEV_RULES_DIR="${TEST_TMPDIR}/udev.rules.d"
|
|
export CPUPOWER_CONF_FILE="${TEST_TMPDIR}/cpupower"
|
|
# arch_cpu.sh reads CPU and block-device state from sysfs; the tests build a
|
|
# fake tree under these roots so a case can present hardware this host does
|
|
# not have (a rotational disk, a core not on the performance governor).
|
|
export CPU_SYSFS_ROOT="${TEST_TMPDIR}/sys_cpu"
|
|
export BLOCK_SYSFS_ROOT="${TEST_TMPDIR}/sys_block"
|
|
# arch_hardware.sh's mitigation tweak edits the boot loader configuration;
|
|
# these keep a test off this machine's real /boot and /etc/default/grub.
|
|
export LOADER_ENTRIES_DIR="${TEST_TMPDIR}/loader_entries"
|
|
export GRUB_DEFAULT_FILE="${TEST_TMPDIR}/grub_default"
|
|
export GRUB_CFG_FILE="${TEST_TMPDIR}/grub.cfg"
|
|
export SYSTEMD_UNIT_DIR="${TEST_TMPDIR}/systemd_units"
|
|
export JOURNALD_CONF_DIR="${TEST_TMPDIR}/journald.conf.d"
|
|
export DRY_RUN="false"
|
|
export AGGRESSIVE="false"
|
|
export INTERACTIVE_MODE="false"
|
|
TWEAKS_APPLIED=0
|
|
TWEAKS_SKIPPED=0
|
|
|
|
# Verbatim from optimize_arch_desktop.sh.
|
|
apply_tweak() {
|
|
local description="$1"
|
|
shift
|
|
|
|
echo ""
|
|
log_info "$description"
|
|
|
|
if [[ $DRY_RUN == "true" ]]; then
|
|
echo " [dry-run] Would run: $*"
|
|
return 0
|
|
fi
|
|
|
|
if [[ $INTERACTIVE_MODE == "true" ]]; then
|
|
if ! ask_yes_no " Apply this optimization?"; then
|
|
log_warn "Skipped."
|
|
((TWEAKS_SKIPPED++)) || true
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
if "$@"; then
|
|
log_ok "Done."
|
|
((TWEAKS_APPLIED++)) || true
|
|
else
|
|
log_error "Failed (non-fatal, continuing)."
|
|
fi
|
|
}
|
|
|
|
# --- external tool stubs ----------------------------------------------------
|
|
|
|
_arch_desktop_default_stubs() {
|
|
local tool
|
|
for tool in sysctl modprobe udevadm cpupower systemctl nvidia-smi \
|
|
lsblk lscpu journalctl pacman grub-mkconfig nvidia-persistenced; do
|
|
_t_stub "$tool" 'exit 0'
|
|
done
|
|
}
|
|
|
|
# arch_desktop_reset — start a test group from "nothing has happened yet".
|
|
arch_desktop_reset() {
|
|
_t_reset_calls
|
|
TWEAKS_APPLIED=0
|
|
TWEAKS_SKIPPED=0
|
|
DRY_RUN="false"
|
|
AGGRESSIVE="false"
|
|
INTERACTIVE_MODE="false"
|
|
export DRY_RUN AGGRESSIVE INTERACTIVE_MODE
|
|
rm -rf "${SYSCTL_DROPIN_DIR}" "${UDEV_RULES_DIR}" "${SYSTEMD_UNIT_DIR}" \
|
|
"${JOURNALD_CONF_DIR}" "${CPU_SYSFS_ROOT}" "${BLOCK_SYSFS_ROOT}"
|
|
mkdir -p "${SYSCTL_DROPIN_DIR}" "${UDEV_RULES_DIR}" "${SYSTEMD_UNIT_DIR}" \
|
|
"${JOURNALD_CONF_DIR}" "${CPU_SYSFS_ROOT}" "${BLOCK_SYSFS_ROOT}"
|
|
rm -f "${CPUPOWER_CONF_FILE}" "${GRUB_DEFAULT_FILE}" "${GRUB_CFG_FILE}"
|
|
rm -rf "${LOADER_ENTRIES_DIR}"
|
|
_t_full_path
|
|
_arch_desktop_default_stubs
|
|
}
|
|
|
|
# _t_make_cpu N GOVERNOR — create N fake cores whose scaling_governor reads
|
|
# GOVERNOR. The layout mirrors the real one closely enough for the lib's
|
|
# `find -maxdepth 3 -name scaling_governor` to reach it.
|
|
_t_make_cpu() {
|
|
local count="$1" governor="$2" i dir
|
|
for ((i = 0; i < count; i++)); do
|
|
dir="${CPU_SYSFS_ROOT}/cpu${i}/cpufreq"
|
|
mkdir -p "$dir"
|
|
printf '%s\n' "$governor" >"${dir}/scaling_governor"
|
|
done
|
|
}
|
|
|
|
# _t_make_block NAME ROTATIONAL SCHEDULER — create one fake block device.
|
|
# SCHEDULER is written in the kernel's own format, with the active entry in
|
|
# brackets, because that is what the lib parses.
|
|
_t_make_block() {
|
|
local name="$1" rotational="$2" scheduler="$3" dir
|
|
dir="${BLOCK_SYSFS_ROOT}/${name}/queue"
|
|
mkdir -p "$dir"
|
|
printf '%s\n' "$rotational" >"${dir}/rotational"
|
|
printf '%s\n' "$scheduler" >"${dir}/scheduler"
|
|
}
|
|
|
|
# _t_sched NAME — the scheduler file's contents for a fake device.
|
|
_t_sched() {
|
|
cat "${BLOCK_SYSFS_ROOT}/$1/queue/scheduler" 2>/dev/null || true
|
|
}
|
|
|
|
# _t_udev FILE — the contents of a udev rule written this round.
|
|
_t_udev() {
|
|
cat "${UDEV_RULES_DIR}/$1" 2>/dev/null || true
|
|
}
|
|
|
|
# _t_dropin FILE — the contents of a sysctl drop-in written this round.
|
|
_t_dropin() {
|
|
cat "${SYSCTL_DROPIN_DIR}/$1" 2>/dev/null || true
|
|
}
|
|
|
|
arch_desktop_reset
|