summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2021-07-01 08:29:10 -0400
committerAndrew Dunstan <andrew@dunslane.net>2021-07-01 09:02:46 -0400
commita0fc813266467d666b8f09ccccaccb700326a296 (patch)
tree141bfab322868cbaf7167105337108eb36509d9b /src/test
parentc8bf5098cbc4f32ca724d830d45d5ceb2ad7f96d (diff)
Fix prove_installcheck to use correct paths when used with PGXS
The prove_installcheck recipe in src/Makefile.global.in was emitting bogus paths for a couple of elements when used with PGXS. Here we create a separate recipe for the PGXS case that does it correctly. We also take the opportunity to make the make the file more readable by breaking up the prove_installcheck and prove_check recipes across several lines, and to remove the setting for REGRESS_SHLIB to src/test/recovery/Makefile, which is the only set of tests that actually need it. Backpatch to all live branches Discussion: https://postgr.es/m/f2401388-936b-f4ef-a07c-a0bcc49b3300@dunslane.net
Diffstat (limited to 'src/test')
-rw-r--r--src/test/recovery/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile
index 96442ceb4e8..288c04b8610 100644
--- a/src/test/recovery/Makefile
+++ b/src/test/recovery/Makefile
@@ -15,6 +15,10 @@ subdir = src/test/recovery
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
+# required for 017_shm.pl
+REGRESS_SHLIB=$(abs_top_builddir)/src/test/regress/regress$(DLSUFFIX)
+export REGRESS_SHLIB
+
check:
$(prove_check)