From fc0ec573e2db410d29d8e381b888ae6ade3cfc64 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Mar 2024 18:38:29 +0100
Subject: [PATCH] Enable TAP tests

---
 .github/workflows/run.yaml  |  2 ++
 .github/workflows/test.yaml |  2 ++
 Dockerfile                  | 12 +++++++++++-
 autoconf.conf               |  2 ++
 meson.conf                  |  1 +
 shared.conf                 |  2 ++
 test.sh                     |  2 ++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml
index e4bf4b7..c2e01ac 100644
--- a/.github/workflows/run.yaml
+++ b/.github/workflows/run.yaml
@@ -53,6 +53,8 @@ jobs:
             buildfarm-client:alpine \
               --test \
               --config ${{ matrix.builder }}.conf \
+              --skip-steps=recovery-check \
+              --skip-suites=recovery-check \
               --delay-check \
               ${{ matrix.branch }}
               # TODO: Remove --delay-check once this is fixed:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 12f5f54..7e42143 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,6 +42,8 @@ jobs:
             buildfarm-client:alpine \
               --test \
               --config ${{ matrix.builder }}.conf \
+              --skip-steps=recovery-check \
+              --skip-suites=recovery-check \
               --delay-check
               # TODO: Remove --delay-check once this is fixed:
               # https://www.postgresql.org/message-id/flat/fddd1cd6-dc16-40a2-9eb5-d7fef2101488%40technowledgy.de
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7c8f605..c94d3cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ RUN apk add \
         flex \
         git \
         krb5-dev \
+        krb5-server \
         libedit-dev \
         libxml2-dev \
         libxslt-dev \
@@ -20,10 +21,12 @@ RUN apk add \
         ninja \
         nss_wrapper \
         openldap-dev \
+        openssl \
         openssl-dev \
         ossp-uuid-dev \
         perl \
         perl-dev \
+        perl-ipc-run \
         perl-lwp-protocol-https \
         perl-mozilla-ca \
         python3-dev \
@@ -62,4 +65,11 @@ VOLUME /buildroot
 ENTRYPOINT ["/docker-entrypoint.sh"]
 # TODO: Remove --delay-check once this is fixed:
 # https://www.postgresql.org/message-id/flat/fddd1cd6-dc16-40a2-9eb5-d7fef2101488%40technowledgy.de
-CMD ["--test", "--config", "autoconf.conf", "--delay-check"]
+CMD [ \
+  "--test", \
+  "--config", \
+  "autoconf.conf", \
+  "--skip-steps=recovery-check", \
+  "--skip-suites=recovery-check", \
+  "--delay-check" \
+]
diff --git a/autoconf.conf b/autoconf.conf
index cef6dbd..4b70d5c 100644
--- a/autoconf.conf
+++ b/autoconf.conf
@@ -6,7 +6,9 @@ $PGGBuild::conf{secret} = $ENV{AUTOCONF_SECRET} // $PGBuild::conf{secret};
 $PGBuild::conf{make_jobs} = 2;
 
 push(@{$PGBuild::conf{config_opts}}, (
+	'--enable-tap-tests',
 	'--with-pam',
+	'--with-ssl=openssl',
 	'--with-uuid=ossp'
 ));
 
diff --git a/meson.conf b/meson.conf
index 97fb9ee..502985d 100644
--- a/meson.conf
+++ b/meson.conf
@@ -9,6 +9,7 @@ $PGBuild::conf{meson_jobs} = 2;
 push(@{$PGBuild::conf{meson_opts}}, (
 	'-Dlz4=enabled',
 	'-Dpam=enabled',
+	'-Dtap_tests=enabled',
 	'-Duuid=ossp',
 	'-Dzstd=enabled'
 ));
diff --git a/shared.conf b/shared.conf
index f87a0fa..b2e3376 100644
--- a/shared.conf
+++ b/shared.conf
@@ -10,4 +10,6 @@ $PGBuild::conf{mail_eventsalerts} = {
 	all => [$ENV{BUILDFARM_EMAIL_ALL}]
 };
 
+@PGBuild::conf{build_env}->{PG_TEST_EXTRA} = 'ssl kerberos';
+
 1;
diff --git a/test.sh b/test.sh
index 3d6018c..4ed4e0c 100755
--- a/test.sh
+++ b/test.sh
@@ -12,6 +12,8 @@ docker run --rm \
   "$(docker build -q .)" \
     --test \
     --config autoconf.conf \
+    --skip-steps=recovery-check \
+    --skip-suites=recovery-check \
     --delay-check \
     "$@"
     # TODO: Remove --delay-check once this is fixed: