From e4c1cc012bfae7319446f8a72864c61c15ca4a95 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Fri, 25 Apr 2025 23:48:09 +0200 Subject: [PATCH] Do not run pg_tde tests in make when in global TDE mode The purpose of the global TDE mode is to run PostgreSQL's normal test suite but with our extension so running the pg_tde test suite when in that mode makes no sense. Meson supports disabling test suites with --no-suite so we only need to do this for the Makefile. --- contrib/pg_tde/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index f71d2895939..80bb82819c1 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -5,6 +5,8 @@ MODULE_big = pg_tde EXTENSION = pg_tde DATA = pg_tde--1.0-rc.sql +# Since meson supports skipping test suites this is a make only feature +ifndef TDE_MODE REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_tde/pg_tde.conf # toast_decrypt needs to be the first test when running with pg_tde # preinstalled and default_principal_key needs to run after key_provider. @@ -25,6 +27,7 @@ vault_v2_test \ version \ default_principal_key TAP_TESTS = 1 +endif OBJS = src/encryption/enc_tde.o \ src/encryption/enc_aes.o \