Skip to content

sql.mk: remove now-dead conditional installcheck:install guard #59

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
jnasbyupgrade wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sql.mk: remove now-dead conditional installcheck:install guard #59

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
21 changes: 0 additions & 21 deletions sql.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,6 @@ all: sql/cat_tools.sql $(versioned_out)
installcheck: sql/cat_tools.sql $(versioned_out)
EXTRA_CLEAN += sql/cat_tools.sql $(versioned_out)

# pgxntool 2.2.0's check-stale-expected depends directly on installcheck, but
# base.mk appends it to TEST_DEPS -- and so freezes `test`'s prerequisite list,
# expanded at the `test: $(TEST_DEPS)` rule's parse time -- BEFORE
# test-build/install/installcheck are appended. Reassigning TEST_DEPS from
# here does not help: it's too late to change a prerequisite list Make already
# expanded. So `make test` resolves check-stale-expected's installcheck edge
# BEFORE test-build's install edge, running the full suite before install ever
# runs on a tree where nothing is installed yet (e.g. fresh CI) -- reproduced
# there as every test failing with schema "cat_tools" does not exist. Filed
# upstream: https://github.com/Postgres-Extensions/pgxntool/issues/79.
#
# Give installcheck itself an install prerequisite to fix it, EXCEPT in
# TEST_EXISTING_DEPLOY=pgtle mode: bin/test_existing's pg_tle-mode run_suite
# deliberately calls `testdeps installcheck` directly (bypassing `test`'s own
# install prerequisite, and thus never touching check-stale-expected at all)
# specifically so the filesystem is never touched -- an unconditional
# installcheck-level fix would defeat that.
ifneq ($(TEST_EXISTING_DEPLOY),pgtle)
installcheck: install
endif

#
# relkind drift source generation
#
Expand Down
Loading