From: Alex Richardson <arichardson@FreeBSD.org>
Date: Tue, 9 Aug 2022 10:56:18 +0000 (+0000)
Subject: test/fdpass.c: skip test that fails on FreeBSD 13.0
X-Git-Tag: dbus-1.15.0~14^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=932b7408269141f152e47eb57d86475f12ba9a51;p=thirdparty%2Fdbus.git

test/fdpass.c: skip test that fails on FreeBSD 13.0

The /odd-limit/at test passes on 13.1 and 14.0 images, but fails on 13.1.
Debugging has not given me any useful hints why this may be the case, so
disable this test on 13.0 for now.

This allows us to drop the ci_test_fatal: "no" override which will ensure
that any FreeBSD regressions are caught.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0492a1931..f46e6ce19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -404,7 +404,6 @@ freebsd image:
     ci_parallel: "${FDO_CI_CONCURRENT:-2}"
     ci_distro: "$BUILD_OS"
     ci_suite: "$FDO_DISTRIBUTION_VERSION"
-    ci_test_fatal: "no" # One undiagnosed test failure in test-fdpass
   script:
     # Start the VM and copy our workspace to the VM
     - /app/vmctl start
diff --git a/test/fdpass.c b/test/fdpass.c
index abd415044..2584c6939 100644
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -752,6 +752,15 @@ test_odd_limit (Fixture *f,
   if (f->skip)
     return;
 
+#ifdef __FreeBSD__
+  g_test_message ("Running test on FreeBSD %d...", getosreldate ());
+  if (GPOINTER_TO_INT (data) == 0 && getosreldate () < 1301000)
+    {
+      g_test_skip ("This test fails on FreeBSD < 13.1");
+      return;
+    }
+#endif
+
   test_connect (f, TRUE);
   dbus_connection_set_max_message_unix_fds (f->left_server_conn, 7);
   dbus_connection_set_max_message_unix_fds (f->right_server_conn, 7);