WIP: Ugly fix to try to make test suite run in CI

Author: jeltz

ci_scripts/build.sh

@@ -4,22 +4,26 @@ set -e
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 PG_CONFIG="$SCRIPT_DIR/../../pginst/bin/pg_config"
-CFLAGS=-Werror
+CFLAGS=
 
 cd "$SCRIPT_DIR/.."
 
+BUILD_TYPE=
+
 case "$1" in
     debug)
         echo "Building with debug option"
+        BUILD_TYPE=$1
         ;;
 
     debugoptimized)
         echo "Building with debugoptimized option"
-        CFLAGS+=" -O2"
+        BUILD_TYPE=$1
         ;;
 
     sanitize)
         echo "Building with sanitize option"
+        BUILD_TYPE=debug
         CFLAGS+=" -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer -fno-inline-functions"
         ;;
 
@@ -31,4 +35,6 @@ case "$1" in
 esac
 
 export CFLAGS
-make PG_CONFIG="$PG_CONFIG" install -j
+meson setup --buildtype="$BUILD_TYPE" -Dpg_config="$PG_CONFIG" build
+cd build
+meson install

ci_scripts/dump-typedefs.sh

@@ -3,13 +3,14 @@
 set -e
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
-cd "$SCRIPT_DIR/.."
+cd "$SCRIPT_DIR/../build"
 
 if ! test -f pg_tde.so; then
   echo "pg_tde.so doesn't exists, run build.sh first in debug mode"
   exit 1
 fi
 
-../postgres/src/tools/find_typedef . > typedefs.list
+../../postgres/src/tools/find_typedef . > typedefs.list
 
+cd ..
 make update-typedefs

ci_scripts/test.sh

@@ -4,7 +4,7 @@ set -e
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 
-cd "$SCRIPT_DIR/.."
+cd "$SCRIPT_DIR/../build"
 
 PG_VERSION=$(../pginst/bin/pg_config --version | sed -n 's/PostgreSQL \([0-9]*\).*/\1/p')
 
@@ -14,10 +14,10 @@ if [ "$1" = sanitize ]; then
     OPTS+=' --set max_stack_depth=8MB'
 fi
 
-../pginst/bin/pg_ctl -D regress_install -l regress_install.log init -o "$OPTS"
+../../pginst/bin/pg_ctl -D regress_install -l regress_install.log init -o "$OPTS"
 
-../pginst/bin/pg_ctl -D regress_install -l regress_install.log start
+../../pginst/bin/pg_ctl -D regress_install -l regress_install.log start
 
-make PG_CONFIG=../pginst/bin/pg_config installcheck
+meson test
 
-../pginst/bin/pg_ctl -D regress_install stop
+../../pginst/bin/pg_ctl -D regress_install stop