From: Michael Paquier Date: Tue, 3 Sep 2024 23:05:44 +0000 (+0900) Subject: Simplify makefiles exporting twice enable_injection_points X-Git-Tag: REL_18_BETA1~2006 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=516ff05539bb70cc378e21e5e67588ec9c959cf7;p=postgresql.git Simplify makefiles exporting twice enable_injection_points This is confusing, as it exports twice the same variable. Oversight in 6782709df81f that has spread in more places afterwards. Reported-by: Alvaro Herrera, Tom Lane Discussion: https://postgr.es/m/202408201630.mn6vbohjh7hh@alvherre.pgsql Backpatch-through: 17 --- diff --git a/src/test/modules/injection_points/Makefile b/src/test/modules/injection_points/Makefile index ed28cd13a8b..1c1c2d0b130 100644 --- a/src/test/modules/injection_points/Makefile +++ b/src/test/modules/injection_points/Makefile @@ -20,7 +20,7 @@ TAP_TESTS = 1 # The injection points are cluster-wide, so disable installcheck NO_INSTALLCHECK = 1 -export enable_injection_points enable_injection_points +export enable_injection_points ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/src/test/modules/test_misc/Makefile b/src/test/modules/test_misc/Makefile index a958d156f47..919a25fc67f 100644 --- a/src/test/modules/test_misc/Makefile +++ b/src/test/modules/test_misc/Makefile @@ -4,7 +4,7 @@ TAP_TESTS = 1 EXTRA_INSTALL=src/test/modules/injection_points -export enable_injection_points enable_injection_points +export enable_injection_points ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/src/test/modules/test_slru/Makefile b/src/test/modules/test_slru/Makefile index 770a5e31ecd..fe4e7390437 100644 --- a/src/test/modules/test_slru/Makefile +++ b/src/test/modules/test_slru/Makefile @@ -8,7 +8,7 @@ OBJS = \ PGFILEDESC = "test_slru - test module for SLRUs" EXTRA_INSTALL=src/test/modules/injection_points -export enable_injection_points enable_injection_points +export enable_injection_points TAP_TESTS = 1 EXTENSION = test_slru diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile index f57baba5e89..d40c05a566d 100644 --- a/src/test/recovery/Makefile +++ b/src/test/recovery/Makefile @@ -18,7 +18,7 @@ subdir = src/test/recovery top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -export enable_injection_points enable_injection_points +export enable_injection_points # required for 017_shm.pl and 027_stream_regress.pl REGRESS_SHLIB=$(abs_top_builddir)/src/test/regress/regress$(DLSUFFIX)