ci: Enable injection points in builds

michaelpq · michaelpq · commit 183b6f73b04e · 2024-01-23T12:01:18.000+09:00
--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
diff --git 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:\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: |
     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"
