Skip to content

test(release): remove the dead INSTALL_DIRS derivation and pin the survivor #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kragent66-glitch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(release): remove the dead INSTALL_DIRS derivation and pin the survivor #453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions tests/release/install-paths.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,36 @@ recipe_vars="$(printf '%s\n' "$recipe" \
| grep -oE '\$\([A-Z_]+\)' | tr -d '$()' | sort -u)"
[ -n "$recipe_vars" ] || { printf 'derived no variables from the recipe\n' >&2; exit 1; }

declared="$(sed -nE 's/^INSTALL_DIRS[[:space:]]*=[[:space:]]*(.*)$/\1/p' "$makefile")"
# The assignment is line-continued, so pull the whole logical line.
declared="$(awk '/^INSTALL_DIRS[[:space:]]*=/{ found=1 } found { print; if ($0 !~ /\\$/) exit }' "$makefile" \
| grep -oE '\$\([A-Z_]+\)' | tr -d '$()' | sort -u)"
# The variables $(INSTALL_DIRS) names, read from a Makefile as a sorted list.
# #449 removed a second derivation that used `sed` on one physical line and
# silently lost every variable past the continuation; this is the survivor.
install_dirs_vars() {
# The assignment is line-continued, so pull the whole logical line.
awk '/^INSTALL_DIRS[[:space:]]*=/{ found=1 } found { print; if ($0 !~ /\\$/) exit }' "$1" \
| grep -oE '\$\([A-Z_]+\)' | tr -d '$()' | sort -u
}

declared="$(install_dirs_vars "$makefile")"
[ -n "$declared" ] || { printf 'Makefile declares no INSTALL_DIRS\n' >&2; exit 1; }

# Pin the property the survivor depends on: a line-continued INSTALL_DIRS has to
# be read whole. Without this, a reader that stops at the backslash can be
# restored — or preferred over the `awk` because the two look redundant — and
# the only visible change is that check 1 stops covering $(HELPERS), which is
# the exact path #301 is about.
fixture="$(mktemp -d)"
trap 'rm -rf "$fixture"' EXIT
cat >"$fixture/Makefile" <<'FIXTURE'
INSTALL_DIRS = $(BINDIR) $(SYSUSERS) $(TMPFILES) \
$(SUDOERS) $(HELPERS)
FIXTURE
fixture_vars="$(install_dirs_vars "$fixture/Makefile")"
for expected in BINDIR SUDOERS HELPERS; do
if ! printf '%s\n' "$fixture_vars" | grep -qx "$expected"; then
note "a line-continued INSTALL_DIRS lost \$$expected; the reader stopped at the backslash"
fi
done

missing="$(comm -23 <(printf '%s\n' "$recipe_vars") <(printf '%s\n' "$declared") || true)"
for v in $missing; do
note "daemon-install writes into \$($v) but INSTALL_DIRS omits it, so the preflight never checks it"
Expand Down
Loading