Hi, Thanks for the feedback!
On Mon, 11 Nov 2024 at 06:34, jian he <jian.universal...@gmail.com> wrote: > > hi. > Actually, there is a difference compared to make. > make works fine with many whitespaces. but meson you can only have one > whitespace. > > meson test -C $BUILD7 --num-processes 20 --suite setup --verbose > export TESTS="test_setup boolean char" > > meson test -C $BUILD7 --suite regress --verbose > --it will fail. > > TESTS="copy jsonb" meson test -C $BUILD7 --suite regress --verbose > --it will fail too. Yes, you are right. It is fixed now. > seems to need rebase, otherwise v4-0001 cannot use `git apply`. Done. -- Regards, Nazir Bilal Yavuz Microsoft
From 0e66e814aa70118b1b6c55f441e9506d2d700900 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 v5 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 | 14 ++++++++------ src/tools/testwrap | 10 ++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 5b0510cef78..073ec71b30c 100644 --- a/meson.build +++ b/meson.build @@ -3394,11 +3394,11 @@ foreach test_dir : tests '--dbname', dbname, ] + t.get('regress_args', []) - test_selection = [] - if t.has_key('schedule') - test_selection += ['--schedule', t['schedule'],] - endif + # To avoid '--schedule' option to be treated as a separate argument in + # the testwrap script if not quoted correctly. + test_schedule = t.get('schedule', []) + test_selection = [] if kind == 'isolation' test_selection += t.get('specs', []) else @@ -3422,12 +3422,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 +3443,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 eede2e0862e19a34fde1576d842b848b96c95c1f 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 v5 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