From 0e73ab29af1ccab9c4dd7453f07b41a4527b0340 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 31 Dec 2025 01:48:56 +0100 Subject: [PATCH v2 2/2] meson: Add support for EXTRA_REGRESS_OPTS and TEMP_CONFIG Add support for the EXTRA_REGRESS_OPTS and TEMP_CONFIG environment variables in our Meson build which work just like with make and apply to all regress, ecpg and isolation tests. --- src/tools/testwrap | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/tools/testwrap b/src/tools/testwrap index e91296ecd15..165d35fba98 100755 --- a/src/tools/testwrap +++ b/src/tools/testwrap @@ -4,6 +4,7 @@ import argparse import shutil import subprocess import os +import shlex import sys parser = argparse.ArgumentParser() @@ -53,6 +54,14 @@ env_dict = {**os.environ, if "PG_TEST_EXTRA" not in env_dict and args.pg_test_extra: env_dict["PG_TEST_EXTRA"] = args.pg_test_extra +# Add extra regress arguments before we add non-option arguments +if args.testname in ['regress', 'isolation', 'ecpg']: + if 'TEMP_CONFIG' in env_dict: + args.test_command += ['--temp-config=' + env_dict['TEMP_CONFIG']] + + if 'EXTRA_REGRESS_OPTS' in env_dict: + args.test_command += shlex.split(env_dict['EXTRA_REGRESS_OPTS']) + if "TESTS" in env_dict: args.test_command += env_dict["TESTS"].split() else: -- 2.47.3