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

Commit 26aca4d

Browse files
committed
meson: Add missing dependencies for libpq tests
The missing dependency was, e.g., visible when doing ninja clean && ninja meson-test-prereq && meson test --no-rebuild --suite setup --suite libpq This is a bit more complicated than other related fixes, because until now libpq's tests depended on 'frontend_code', which includes a dependency on fe_utils, which in turns on libpq. That in turn required src/interfaces/libpq/test to be entered from the top-level, not from libpq/meson.build. Because of that the test definitions in libpq/meson.build could not declare a dependency on the binaries defined in libpq/test/meson.build. To fix this, this commit creates frontend_no_fe_utils_code, which allows us to recurse into libpq/test from withing libpq/meson.build. Apply this to all branches with meson support, as part of an effort to fix incorrect test dependencies that can lead to test failures. Discussion: https://postgr.es/m/CAGECzQSvM3iSDmjF+=Kof5an6jN8UbkP_4cKKT9w6GZavmb5yQ@mail.gmail.com Discussion: https://postgr.es/m/bdba588f-69a9-4f3e-9b95-62d07210a32e@eisentraut.org Backpatch: 16-, where meson support was added
1 parent c89525d commit 26aca4d

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

meson.build

+10-1
Original file line numberDiff line numberDiff line change
@@ -3028,6 +3028,16 @@ frontend_shlib_code = declare_dependency(
30283028
dependencies: [shlib_code, os_deps, libintl],
30293029
)
30303030

3031+
# For frontend code that doesn't use fe_utils - this mainly exists for libpq's
3032+
# tests, which are defined before fe_utils is defined, as fe_utils depends on
3033+
# libpq.
3034+
frontend_no_fe_utils_code = declare_dependency(
3035+
include_directories: [postgres_inc],
3036+
link_with: [common_static, pgport_static],
3037+
sources: generated_headers,
3038+
dependencies: [os_deps, libintl],
3039+
)
3040+
30313041
# Dependencies both for static and shared libpq
30323042
libpq_deps += [
30333043
thread_dep,
@@ -3095,7 +3105,6 @@ subdir('src')
30953105
subdir('contrib')
30963106

30973107
subdir('src/test')
3098-
subdir('src/interfaces/libpq/test')
30993108
subdir('src/interfaces/ecpg/test')
31003109

31013110
subdir('doc/src/sgml')

src/interfaces/libpq/meson.build

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Copyright (c) 2022-2025, PostgreSQL Global Development Group
22

3-
# test/ is entered via top-level meson.build, that way it can use the default
4-
# args for executables (which depend on libpq).
5-
63
libpq_sources = files(
74
'fe-auth-scram.c',
85
'fe-auth.c',
@@ -107,6 +104,7 @@ install_data('pg_service.conf.sample',
107104
install_dir: dir_data,
108105
)
109106

107+
subdir('test')
110108

111109
tests += {
112110
'name': 'libpq',
@@ -125,6 +123,7 @@ tests += {
125123
'with_gssapi': gssapi.found() ? 'yes' : 'no',
126124
'with_krb_srvnam': 'postgres',
127125
},
126+
'deps': libpq_test_deps,
128127
},
129128
}
130129

src/interfaces/libpq/test/meson.build

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Copyright (c) 2022-2025, PostgreSQL Global Development Group
22

3+
libpq_test_deps = []
4+
35
libpq_uri_regress_sources = files(
46
'libpq_uri_regress.c',
57
)
@@ -10,9 +12,9 @@ if host_system == 'windows'
1012
'--FILEDESC', 'libpq test program',])
1113
endif
1214

13-
testprep_targets += executable('libpq_uri_regress',
15+
libpq_test_deps += executable('libpq_uri_regress',
1416
libpq_uri_regress_sources,
15-
dependencies: [frontend_code, libpq],
17+
dependencies: [frontend_no_fe_utils_code, libpq],
1618
kwargs: default_bin_args + {
1719
'install': false,
1820
}
@@ -29,10 +31,12 @@ if host_system == 'windows'
2931
'--FILEDESC', 'libpq test program',])
3032
endif
3133

32-
testprep_targets += executable('libpq_testclient',
34+
libpq_test_deps += executable('libpq_testclient',
3335
libpq_testclient_sources,
34-
dependencies: [frontend_code, libpq],
36+
dependencies: [frontend_no_fe_utils_code, libpq],
3537
kwargs: default_bin_args + {
3638
'install': false,
3739
}
3840
)
41+
42+
testprep_targets += libpq_test_deps

0 commit comments

Comments
 (0)