Enable TAP tests

technowledgy · Mar 24, 2024 · fe3dec2 · fe3dec2
1 parent eeee953
commit fe3dec2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml
@@ -57,6 +57,8 @@ jobs:
             buildfarm-client:alpine \
               --test \
               --config ${{ matrix.builder }}.conf \
+              --skip-steps=recovery-check \
+              --skip-suites=recovery \
               --delay-check \
               ${{ matrix.branch }}
               # TODO: Remove --delay-check once this is fixed:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -51,6 +51,8 @@ jobs:
             buildfarm-client:alpine \
               --test \
               --config ${{ matrix.builder }}.conf \
+              --skip-steps=recovery-check \
+              --skip-suites=recovery \
               --delay-check
               # TODO: Remove --delay-check once this is fixed:
               # https://www.postgresql.org/message-id/flat/fddd1cd6-dc16-40a2-9eb5-d7fef2101488%40technowledgy.de

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,9 @@ RUN apk add \
         ccache \
         flex \
         git \
+        krb5 \
         krb5-dev \
+        krb5-server \
         libedit-dev \
         libxml2-dev \
         libxslt-dev \
@@ -20,10 +22,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 \
@@ -59,4 +63,11 @@ COPY *.conf /usr/src
 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", \
+  "--delay-check" \
+]
diff --git 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
@@ -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
@@ -11,4 +11,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
@@ -17,6 +17,8 @@ docker run --rm \
     --nosend --nostatus --verbose \
     --from-source /mnt/source \
     --config autoconf.conf \
+    --skip-steps=recovery-check \
+    --skip-suites=recovery \
     --delay-check \
     "$@"
     # TODO: Remove --delay-check once this is fixed:
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,6 @@ $PGBuild::conf{mail_eventsalerts} = { @@
     	all => [$ENV{BUILDFARM_EMAIL_ALL}]
     };
+    @PGBuild::conf{build_env}->{PG_TEST_EXTRA} = 'ssl kerberos';
 ;