From 6e0cbc3e5c5b8e53f0483df3115718129fc6b648 Mon Sep 17 00:00:00 2001 From: jnasbyupgrade Date: Fri, 31 Jul 2026 18:35:10 -0500 Subject: [PATCH] sql.mk: remove now-dead conditional installcheck:install guard pgxntool 2.3.0 fixed issue #79 by making installcheck unconditionally depend on install directly in base.mk, so this conditional (guarded to skip in TEST_EXISTING_DEPLOY=pgtle mode) no longer has any effect: base.mk's own unconditional edge fires regardless of what this file does. The pgtle-mode side effect it was guarding against is now handled instead by redirecting install's writes to a scratch DESTDIR in bin/test_existing. Verified make test and make verify-results still pass without it. --- sql.mk | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sql.mk b/sql.mk index 60663c4..6fd84dd 100644 --- a/sql.mk +++ b/sql.mk @@ -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 #