Hi,
Thanks for checking it!
On Tue, 19 Nov 2024 at 15:19, Ashutosh Bapat
<ashutosh.bapat....@gmail.com> wrote:
>
> On Thu, Oct 31, 2024 at 11:28 PM Nazir Bilal Yavuz <byavu...@gmail.com> wrote:
> >
> > Yes, that is exactly why we have both '--schedule' and '--tests'
> > flags. Also, a comment is added to clarify this.
>
> The comment is useful if we want to understand this change but I feel
> it's confusing when reading the code. I don't think we need the
> comment. The code is clearer than before as is.
I got it, the comment is removed.
> > > It might be better to make this explicit in the code -- by making sure
> > > that only one of them is passed and writing a comment about it.
> > > ArgumentParser might have some trick to specify that passing both the
> > > arguments is an error.
> >
> > I did not understand why only one of them needed to be passed at a
> > time. For example in ecpg tests
> > (src/interfaces/ecpg/test/meson.build), both '--schedule' and
> > '--tests' options are passed.
>
> Is it because it has both schedule as well as sql?
> 'ecpg': {
> 'expecteddir': meson.current_source_dir(),
> 'inputdir': meson.current_build_dir(),
> 'schedule': ecpg_test_files,
> 'sql': [
> 'sql/twophase',
> ],
>
> I see sql/twophase is not part of ecpg_schedule and it's passes
> separately to testwrap.
Yes. All the tests without schedule option are collected in the
test_selection in the meson.build file:
test_selection = []
if kind == 'isolation'
test_selection += t.get('specs', [])
else
test_selection += t.get('sql', [])
endif
And, AFAIU all the regression test suites accept both schedule option
and tests by their names. So, it should be safe to pass both
--schedule and --tests.
--
Regards,
Nazir Bilal Yavuz
Microsoft
From 5a47b29c96cf12435ccb8f88d56788f15329a3e3 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavu...@gmail.com>
Date: Mon, 11 Nov 2024 10:35:02 +0300
Subject: [PATCH v6 1/2] Add 'make check-tests' behavior to the meson based
builds
There was no way to run specific regression tests in the regress/regress
tests in the meson based builds. Add this behavior.
Author: Nazir Bilal Yavuz <byavu...@gmail.com>
Reviewed-by: Ashutosh Bapat <ashutosh.bapat....@gmail.com>
Reviewed-by: Jian He <jian.universal...@gmail.com>
Discussion: postgr.es/m/CAExHW5tK-QqayUN0%2BN3MF5bjV6vLKDCkRuGwoDJwc7vGjwCygQ%40mail.gmail.com
---
meson.build | 12 ++++++------
src/tools/testwrap | 10 ++++++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 5b0510cef78..2a3e60a0ae8 100644
--- a/meson.build
+++ b/meson.build
@@ -3394,11 +3394,9 @@ foreach test_dir : tests
'--dbname', dbname,
] + t.get('regress_args', [])
- test_selection = []
- if t.has_key('schedule')
- test_selection += ['--schedule', t['schedule'],]
- endif
+ test_schedule = t.get('schedule', [])
+ test_selection = []
if kind == 'isolation'
test_selection += t.get('specs', [])
else
@@ -3422,12 +3420,13 @@ foreach test_dir : tests
testwrap_base,
'--testgroup', test_group,
'--testname', kind,
+ '--schedule', test_schedule,
+ '--tests', test_selection,
'--',
test_command_base,
'--outputdir', test_output,
'--temp-instance', test_output / 'tmp_check',
'--port', testport.to_string(),
- test_selection,
],
suite: test_group,
kwargs: test_kwargs,
@@ -3442,10 +3441,11 @@ foreach test_dir : tests
testwrap_base,
'--testgroup', test_group_running,
'--testname', kind,
+ '--schedule', test_schedule,
+ '--tests', test_selection,
'--',
test_command_base,
'--outputdir', test_output_running,
- test_selection,
],
is_parallel: t.get('runningcheck-parallel', true),
suite: test_group_running,
diff --git a/src/tools/testwrap b/src/tools/testwrap
index 8ae8fb79ba7..998006c7361 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 and args.testgroup == 'regress' and args.testname == 'regress':
+ 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
--
2.45.2
From 185ce9323387d8a66248d9000d31999642c223e3 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavu...@gmail.com>
Date: Thu, 26 Sep 2024 10:24:52 +0300
Subject: [PATCH v6 2/2] Expand test selection behavior to all test types in
meson based builds
Previously, the ability to select specific tests to run was limited to
regress/regress tests. This commit extends that functionality to all test
types in the meson based builds.
Author: Nazir Bilal Yavuz <byavu...@gmail.com>
Reviewed-by: Ashutosh Bapat <ashutosh.bapat....@gmail.com>
Reviewed-by: Jian He <jian.universal...@gmail.com>
Discussion: postgr.es/m/CAExHW5tK-QqayUN0%2BN3MF5bjV6vLKDCkRuGwoDJwc7vGjwCygQ%40mail.gmail.com
---
src/tools/testwrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/testwrap b/src/tools/testwrap
index 998006c7361..6ccf2732363 100755
--- a/src/tools/testwrap
+++ b/src/tools/testwrap
@@ -53,7 +53,7 @@ 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 and args.testgroup == 'regress' and args.testname == 'regress':
+if "TESTS" in env_dict:
args.test_command += env_dict["TESTS"].split()
else:
if args.schedule:
--
2.45.2
