forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit26aca4d
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 libpqThis is a bit more complicated than other related fixes, because until nowlibpq's tests depended on 'frontend_code', which includes a dependency onfe_utils, which in turns on libpq. That in turn requiredsrc/interfaces/libpq/test to be entered from the top-level, not fromlibpq/meson.build. Because of that the test definitions in libpq/meson.buildcould not declare a dependency on the binaries defined inlibpq/test/meson.build.To fix this, this commit creates frontend_no_fe_utils_code, which allows us torecurse into libpq/test from withing libpq/meson.build.Apply this to all branches with meson support, as part of an effort to fixincorrect test dependencies that can lead to test failures.Discussion:https://postgr.es/m/CAGECzQSvM3iSDmjF+=Kof5an6jN8UbkP_4cKKT9w6GZavmb5yQ@mail.gmail.comDiscussion:https://postgr.es/m/bdba588f-69a9-4f3e-9b95-62d07210a32e@eisentraut.orgBackpatch: 16-, where meson support was added1 parentc89525d commit26aca4d
3 files changed
+20
-8
lines changedLines changed: 10 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3028 | 3028 |
| |
3029 | 3029 |
| |
3030 | 3030 |
| |
| 3031 | + | |
| 3032 | + | |
| 3033 | + | |
| 3034 | + | |
| 3035 | + | |
| 3036 | + | |
| 3037 | + | |
| 3038 | + | |
| 3039 | + | |
| 3040 | + | |
3031 | 3041 |
| |
3032 | 3042 |
| |
3033 | 3043 |
| |
| |||
3095 | 3105 |
| |
3096 | 3106 |
| |
3097 | 3107 |
| |
3098 |
| - | |
3099 | 3108 |
| |
3100 | 3109 |
| |
3101 | 3110 |
| |
|
Lines changed: 2 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 |
| - | |
4 |
| - | |
5 |
| - | |
6 | 3 |
| |
7 | 4 |
| |
8 | 5 |
| |
| |||
107 | 104 |
| |
108 | 105 |
| |
109 | 106 |
| |
| 107 | + | |
110 | 108 |
| |
111 | 109 |
| |
112 | 110 |
| |
| |||
125 | 123 |
| |
126 | 124 |
| |
127 | 125 |
| |
| 126 | + | |
128 | 127 |
| |
129 | 128 |
| |
130 | 129 |
| |
|
Lines changed: 8 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
| 3 | + | |
| 4 | + | |
3 | 5 |
| |
4 | 6 |
| |
5 | 7 |
| |
| |||
10 | 12 |
| |
11 | 13 |
| |
12 | 14 |
| |
13 |
| - | |
| 15 | + | |
14 | 16 |
| |
15 |
| - | |
| 17 | + | |
16 | 18 |
| |
17 | 19 |
| |
18 | 20 |
| |
| |||
29 | 31 |
| |
30 | 32 |
| |
31 | 33 |
| |
32 |
| - | |
| 34 | + | |
33 | 35 |
| |
34 |
| - | |
| 36 | + | |
35 | 37 |
| |
36 | 38 |
| |
37 | 39 |
| |
38 | 40 |
| |
| 41 | + | |
| 42 | + |
0 commit comments
Comments
(0)