Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a5d1c5d

Browse files
author
Commitfest Bot
committed
[CF 5602] Add support for EXTRA_REGRESS_OPTS for meson test
This branch was automatically generated by a robot using patches from an email thread registered at: https://commitfest.postgresql.org/patch/5602 The branch will be overwritten each time a new patch version is posted to the thread, and also periodically to check for bitrot caused by changes on the master branch. Patch(es): https://www.postgresql.org/message-id/fce84be6-3158-4b9c-9b40-a403c49d2966@proxel.se Author(s): Andreas Karlsson
2 parents 0dca5d6 + d95b67a commit a5d1c5d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/tools/testwrap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import argparse
44
import shutil
5+
import shlex
56
import subprocess
67
import os
78
import sys
@@ -51,7 +52,12 @@ env_dict = {**os.environ,
5152
if "PG_TEST_EXTRA" not in env_dict and args.pg_test_extra:
5253
env_dict["PG_TEST_EXTRA"] = args.pg_test_extra
5354

54-
sp = subprocess.Popen(args.test_command, env=env_dict, stdout=subprocess.PIPE)
55+
if args.testname in ['regress', 'isolation', 'ecpg'] and 'EXTRA_REGRESS_OPTS' in env_dict:
56+
test_command = args.test_command + shlex.split(env_dict['EXTRA_REGRESS_OPTS'])
57+
else:
58+
test_command = args.test_command
59+
60+
sp = subprocess.Popen(test_command, env=env_dict, stdout=subprocess.PIPE)
5561
# Meson categorizes a passing TODO test point as bad
5662
# (https://github.com/mesonbuild/meson/issues/13183). Remove the TODO
5763
# directive, so Meson computes the file result like Perl does. This could

0 commit comments

Comments
 (0)