git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Michael Paquier <michael@paquier.xyz>

2024年1月23日 03:01:18 +0000 (12:01 +0900)

committer Michael Paquier <michael@paquier.xyz>

2024年1月23日 03:01:18 +0000 (12:01 +0900)

--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

.cirrus.tasks.yml patch | blob | blame | history

diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml

index e137769850dfb77106492ee7b5849fe686b617c9..e4e1bcfeb9945cd5d3e7cf1e5fa87f0a0c77a9b3 100644 (file)

--- a/.cirrus.tasks.yml

+++ b/.cirrus.tasks.yml

@@ -172,7 +172,8 @@ task:

su postgres <<-EOF

meson setup \

--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" \

-Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \

build

@@ -327,8 +328,8 @@ task:

configure_script: |

su postgres <<-EOF

./configure \

- --enable-cassert --enable-debug --enable-tap-tests \

- --enable-nls \

+ --enable-cassert --enable-injection-points --enable-debug \

+ --enable-tap-tests --enable-nls \

--with-segsize-blocks=6 \

${LINUX_CONFIGURE_FEATURES} \

@@ -357,7 +358,7 @@ task:

su postgres <<-EOF

meson setup \

--buildtype=debug \

- -Dcassert=true \

+ -Dcassert=true -Dinjection_points=true \

${LINUX_MESON_FEATURES} \

-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \

build

@@ -370,7 +371,7 @@ task:

export CC='ccache gcc -m32'

meson setup \

--buildtype=debug \

- -Dcassert=true \

+ -Dcassert=true -Dinjection_points=true \

${LINUX_MESON_FEATURES} \

-Dllvm=disabled \

--pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \

@@ -482,7 +483,7 @@ task:

--buildtype=debug \

-Dextra_include_dirs=/opt/local/include \

-Dextra_lib_dirs=/opt/local/lib \

- -Dcassert=true \

+ -Dcassert=true -Dinjection_points=true \

-Duuid=e2fs -Ddtrace=auto \

-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \

build

@@ -556,7 +557,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 -Db_pch=true -Dextra_lib_dirs=c:\openssl1円.1\lib -Dextra_include_dirs=c:\openssl1円.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:\openssl1円.1\lib -Dextra_include_dirs=c:\openssl1円.1\include -DTAR=%TAR% -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" build

build_script: |

vcvarsall x64

@@ -616,7 +617,7 @@ task:

# disable -Dnls as the number of files it creates cause a noticable slowdown

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: |

%BASH% -c "ninja -C build"

This is the main PostgreSQL git repository.

RSS Atom