summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rwxr-xr-xsrc/tools/codelines7
-rw-r--r--src/tools/pgindent/typedefs.list3
-rwxr-xr-xsrc/tools/testwrap10
3 files changed, 12 insertions, 8 deletions
diff --git a/src/tools/codelines b/src/tools/codelines
deleted file mode 100755
index 93ad571acf9..00000000000
--- a/src/tools/codelines
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# src/tools/codelines
-
-# This script is used to compute the total number of "C" lines in the release
-# This should be run from the top of the Git tree.
-git ls-files -- '*.[chyl]' | xargs cat | wc -l
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 27a4d131897..0d1ea4ec63d 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -2917,6 +2917,7 @@ SubscriptionRelState
SummarizerReadLocalXLogPrivate
SupportRequestCost
SupportRequestIndexCondition
+SupportRequestInlineInFrom
SupportRequestModifyInPlace
SupportRequestOptimizeWindowClause
SupportRequestRows
@@ -4140,7 +4141,7 @@ storeRes_func
stream_stop_callback
string
substitute_actual_parameters_context
-substitute_actual_srf_parameters_context
+substitute_actual_parameters_in_from_context
substitute_grouped_columns_context
substitute_phv_relids_context
subxids_array_status
diff --git a/src/tools/testwrap b/src/tools/testwrap
index 02f1951ad7e..e91296ecd15 100755
--- a/src/tools/testwrap
+++ b/src/tools/testwrap
@@ -12,6 +12,8 @@ parser.add_argument('--srcdir', help='source directory of test', type=str)
parser.add_argument('--basedir', help='base directory of test', type=str)
parser.add_argument('--testgroup', help='test group', type=str)
parser.add_argument('--testname', help='test name', type=str)
+parser.add_argument('--schedule', help='schedule tests', nargs='*')
+parser.add_argument('--tests', help='tests', nargs='*')
parser.add_argument('--skip', help='skip test (with reason)', type=str)
parser.add_argument('--pg-test-extra', help='extra tests', type=str)
parser.add_argument('test_command', nargs='*')
@@ -51,6 +53,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
+if "TESTS" in env_dict:
+ args.test_command += env_dict["TESTS"].split()
+else:
+ if args.schedule:
+ args.test_command += ['--schedule', ' '.join(args.schedule)]
+ if args.tests:
+ args.test_command.extend(args.tests)
+
sp = subprocess.Popen(args.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