From 035fe94107fe2c03647a4bb3ec4f0b3d1673e004 Mon Sep 17 00:00:00 2001 From: Nazir Bilal Yavuz Date: Wed, 11 Sep 2024 15:41:27 +0300 Subject: [PATCH v5 1/2] Make PG_TEST_EXTRA env variable override its Meson configure option Since PG_TEST_EXTRA configure option is set while configuring Meson, each change on PG_TEST_EXTRA needs reconfigure and this is costly. So, first try to use PG_TEST_EXTRA from environment. If it does not exist, then try to use it from its configure option in Meson builds. After the above change, Meson builds are able to get PG_TEST_EXTRA from environment and this overrides the configure option. PG_TEST_EXTRA environment variable is set at the top of the .cirrus.tasks.yml file. So, PG_TEXT_EXTRA in configure scripts became useless and were removed because of that. --- doc/src/sgml/installation.sgml | 6 ++++-- .cirrus.tasks.yml | 6 +----- meson.build | 11 ++++++----- meson_options.txt | 2 +- src/tools/testwrap | 10 ++++++++++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index ff9abd4649d..7c481e07e98 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -3073,8 +3073,10 @@ ninja install Enable test suites which require special software to run. This option - accepts arguments via a whitespace-separated list. See for details. + accepts arguments via a whitespace-separated list. Please note that + this configure option is overridden by PG_TEST_EXTRA environment + variable if it is set. See for + details. diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index 90cb95c8681..fc413eb11ef 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -175,7 +175,6 @@ task: --buildtype=debug \ -Dcassert=true -Dinjection_points=true \ -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \ build EOF @@ -364,7 +363,6 @@ task: --buildtype=debug \ -Dcassert=true -Dinjection_points=true \ ${LINUX_MESON_FEATURES} \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build EOF @@ -380,7 +378,6 @@ task: -Dllvm=disabled \ --pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \ -DPERL=perl5.36-i386-linux-gnu \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build-32 EOF @@ -502,7 +499,6 @@ task: -Dextra_lib_dirs=/opt/local/lib \ -Dcassert=true -Dinjection_points=true \ -Duuid=e2fs -Ddtrace=auto \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build build_script: ninja -C build -j${BUILD_JOBS} @@ -574,7 +570,7 @@ task: # Use /DEBUG:FASTLINK to avoid high memory usage during linking configure_script: | vcvarsall x64 - meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" build + meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% build build_script: | vcvarsall x64 diff --git a/meson.build b/meson.build index 4764b09266e..9d1d8847af3 100644 --- a/meson.build +++ b/meson.build @@ -3322,11 +3322,6 @@ test_env.set('PG_REGRESS', pg_regress.full_path()) test_env.set('REGRESS_SHLIB', regress_module.full_path()) test_env.set('INITDB_TEMPLATE', test_initdb_template) -# Test suites that are not safe by default but can be run if selected -# by the user via the whitespace-separated list in variable PG_TEST_EXTRA. -# Export PG_TEST_EXTRA so it can be checked in individual tap tests. -test_env.set('PG_TEST_EXTRA', get_option('PG_TEST_EXTRA')) - # Add the temporary installation to the library search path on platforms where # that works (everything but windows, basically). On windows everything # library-like gets installed into bindir, solving that issue. @@ -3390,6 +3385,12 @@ foreach test_dir : tests testwrap, '--basedir', meson.build_root(), '--srcdir', test_dir['sd'], + # Test suites that are not safe by default but can be run if selected + # by the user via the whitespace-separated list in variable PG_TEST_EXTRA. + # Export PG_TEST_EXTRA so it can be checked in individual tap tests. + # This configure option is overridden by PG_TEST_EXTRA environment variable + # if it exists. + '--pg-test-extra', get_option('PG_TEST_EXTRA'), ] foreach kind, v : test_dir diff --git a/meson_options.txt b/meson_options.txt index b9421557606..38935196394 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,7 +47,7 @@ option('injection_points', type: 'boolean', value: false, description: 'Enable injection points') option('PG_TEST_EXTRA', type: 'string', value: '', - description: 'Enable selected extra tests') + description: 'Enable selected extra tests. Overridden by PG_TEST_EXTRA environment variable.') option('PG_GIT_REVISION', type: 'string', value: 'HEAD', description: 'git revision to be packaged by pgdist target') diff --git a/src/tools/testwrap b/src/tools/testwrap index 9a270beb72d..8ae8fb79ba7 100755 --- a/src/tools/testwrap +++ b/src/tools/testwrap @@ -13,6 +13,7 @@ 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('--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='*') args = parser.parse_args() @@ -41,6 +42,15 @@ env_dict = {**os.environ, 'TESTDATADIR': os.path.join(testdir, 'data'), 'TESTLOGDIR': os.path.join(testdir, 'log')} + +# The configuration time value of PG_TEST_EXTRA is supplied via arguement +# --pg-test-extra. But it can be overridden by environment variable +# PG_TEST_EXTRA at the time of running a test. Hence use value from arguments +# only if PG_TEST_EXTRA is not set in the test environment, which already +# contains all the environment variables at the time of running the test. +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) # Meson categorizes a passing TODO test point as bad # (https://github.com/mesonbuild/meson/issues/13183). Remove the TODO -- 2.45.2