From 87ce622a19315b679bbd5691e01c96261bc0c4c8 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Thu, 27 Feb 2025 00:23:44 +0100 Subject: [PATCH] meson: Add support for EXTRA_REGRESS_OPTS Add support for the EXTRA_REGRESS_OPTS environment variable in meson which works just like with make and applies to all regress, ecpg and isolation tests. TAP tests which support it under make will continue to support the option. Run it with e.g: EXTRA_REGRESS_OPTS="--temp-config=test.conf" meson test --- src/tools/testwrap | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/tools/testwrap b/src/tools/testwrap index 8ae8fb79ba7..f52ca376da1 100755 --- a/src/tools/testwrap +++ b/src/tools/testwrap @@ -2,6 +2,7 @@ import argparse import shutil +import shlex import subprocess import os import sys @@ -51,7 +52,12 @@ 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 -sp = subprocess.Popen(args.test_command, env=env_dict, stdout=subprocess.PIPE) +if args.testname in ['regress', 'isolation', 'ecpg'] and 'EXTRA_REGRESS_OPTS' in env_dict: + test_command = args.test_command + shlex.split(env_dict['EXTRA_REGRESS_OPTS']) +else: + test_command = args.test_command + +sp = subprocess.Popen(test_command, env=env_dict, stdout=subprocess.PIPE) # Meson categorizes a passing TODO test point as bad # (https://github.com/mesonbuild/meson/issues/13183). Remove the TODO # directive, so Meson computes the file result like Perl does. This could -- 2.47.2