mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Enable injection points in builds

Browse Source 
--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
This commit is contained in:
Michael Paquier 2024-01-23 12:01:18 +09:00
parent 4372adfa24
commit 183b6f73b0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.cirrus.tasks.yml
View File

@ -172,7 +172,8 @@ task:
su postgres <<-EOF su postgres <<-EOF
meson setup \ meson setup \
--buildtype=debug \ --buildtype=debug \
-Dcassert=true -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \ -Dcassert=true -Dinjection_points=true \
-Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
-Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \ -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
build build
@ -327,8 +328,8 @@ task:
configure_script: | configure_script: |
su postgres <<-EOF su postgres <<-EOF
./configure \ ./configure \
--enable-cassert --enable-debug --enable-tap-tests \ --enable-cassert --enable-injection-points --enable-debug \
--enable-nls \ --enable-tap-tests --enable-nls \
--with-segsize-blocks=6 \ --with-segsize-blocks=6 \
\ \
${LINUX_CONFIGURE_FEATURES} \ ${LINUX_CONFIGURE_FEATURES} \
@ -357,7 +358,7 @@ task:
su postgres <<-EOF su postgres <<-EOF
meson setup \ meson setup \
--buildtype=debug \ --buildtype=debug \
-Dcassert=true \ -Dcassert=true -Dinjection_points=true \
${LINUX_MESON_FEATURES} \ ${LINUX_MESON_FEATURES} \
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
build build
@ -370,7 +371,7 @@ task:
export CC='ccache gcc -m32' export CC='ccache gcc -m32'
meson setup \ meson setup \
--buildtype=debug \ --buildtype=debug \
-Dcassert=true \ -Dcassert=true -Dinjection_points=true \
${LINUX_MESON_FEATURES} \ ${LINUX_MESON_FEATURES} \
-Dllvm=disabled \ -Dllvm=disabled \
--pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \ --pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \
@ -482,7 +483,7 @@ task:
--buildtype=debug \ --buildtype=debug \
-Dextra_include_dirs=/opt/local/include \ -Dextra_include_dirs=/opt/local/include \
-Dextra_lib_dirs=/opt/local/lib \ -Dextra_lib_dirs=/opt/local/lib \
-Dcassert=true \ -Dcassert=true -Dinjection_points=true \
-Duuid=e2fs -Ddtrace=auto \ -Duuid=e2fs -Ddtrace=auto \
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
build build
@ -556,7 +557,7 @@ task:
# Use /DEBUG:FASTLINK to avoid high memory usage during linking # Use /DEBUG:FASTLINK to avoid high memory usage during linking
configure_script: | configure_script: |
vcvarsall x64 vcvarsall x64
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 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
build_script: | build_script: |
vcvarsall x64 vcvarsall x64
@ -616,7 +617,7 @@ task:
# disable -Dnls as the number of files it creates cause a noticable slowdown # disable -Dnls as the number of files it creates cause a noticable slowdown
configure_script: | configure_script: |
%BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build" %BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Dinjection_points=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
build_script: | build_script: |
%BASH% -c "ninja -C build" %BASH% -c "ninja -C build"