Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 183b6f7

Browse filesBrowse files
michaelpqmichaelpq
committed
ci: Enable injection points in builds
--enable-injection-points and -Dinjection_points=true are now given to the commands triggered by the tasks where assertions are enabled, providing coverage for injection points or any test using them. Author: Heikki Linnakangas Discussion: https://postgr.es/m/0615a424-b726-4157-afa7-4245629f9512@iki.fi
1 parent 4372adf commit 183b6f7
Copy full SHA for 183b6f7

File tree

Expand file treeCollapse file tree

1 file changed

+9
-8
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+9
-8
lines changed

‎.cirrus.tasks.yml

Copy file name to clipboardExpand all lines: .cirrus.tasks.yml
+9-8Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ task:
172172
su postgres <<-EOF
173173
meson setup \
174174
--buildtype=debug \
175-
-Dcassert=true -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \
175+
-Dcassert=true -Dinjection_points=true \
176+
-Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \
176177
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
177178
-Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
178179
build
@@ -327,8 +328,8 @@ task:
327328
configure_script: |
328329
su postgres <<-EOF
329330
./configure \
330-
--enable-cassert --enable-debug --enable-tap-tests \
331-
--enable-nls \
331+
--enable-cassert --enable-injection-points --enable-debug \
332+
--enable-tap-tests --enable-nls \
332333
--with-segsize-blocks=6 \
333334
\
334335
${LINUX_CONFIGURE_FEATURES} \
@@ -357,7 +358,7 @@ task:
357358
su postgres <<-EOF
358359
meson setup \
359360
--buildtype=debug \
360-
-Dcassert=true \
361+
-Dcassert=true -Dinjection_points=true \
361362
${LINUX_MESON_FEATURES} \
362363
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
363364
build
@@ -370,7 +371,7 @@ task:
370371
export CC='ccache gcc -m32'
371372
meson setup \
372373
--buildtype=debug \
373-
-Dcassert=true \
374+
-Dcassert=true -Dinjection_points=true \
374375
${LINUX_MESON_FEATURES} \
375376
-Dllvm=disabled \
376377
--pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \
@@ -482,7 +483,7 @@ task:
482483
--buildtype=debug \
483484
-Dextra_include_dirs=/opt/local/include \
484485
-Dextra_lib_dirs=/opt/local/lib \
485-
-Dcassert=true \
486+
-Dcassert=true -Dinjection_points=true \
486487
-Duuid=e2fs -Ddtrace=auto \
487488
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
488489
build
@@ -556,7 +557,7 @@ task:
556557
# Use /DEBUG:FASTLINK to avoid high memory usage during linking
557558
configure_script: |
558559
vcvarsall x64
559-
meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=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
560+
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
560561
561562
build_script: |
562563
vcvarsall x64
@@ -616,7 +617,7 @@ task:
616617
617618
# disable -Dnls as the number of files it creates cause a noticable slowdown
618619
configure_script: |
619-
%BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
620+
%BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Dinjection_points=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
620621
621622
build_script: |
622623
%BASH% -c "ninja -C build"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.