Merge branch 'pdf-structure-test' into 'master'

Enable pdf-structure test

See merge request cairo/cairo!559

.gitlab-ci.yml

@@ -16,7 +16,7 @@ workflow:
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
   FDO_DISTRIBUTION_VERSION: '40'
-  FDO_DISTRIBUTION_TAG: '2024-04-26.0'
+  FDO_DISTRIBUTION_TAG: '2024-05-25.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
@@ -95,6 +95,7 @@ fedora image:
       google-noto-sans-vf-fonts
       fonttools
       util-linux
+      poppler-utils
 
 .build fedora:
   extends:

test/pdf-structure.c

@@ -554,7 +554,7 @@ check_pdf (cairo_test_context_t *ctx, const struct pdf_structure_test *test, con
         if (WEXITSTATUS (ret) == 0)
             result = CAIRO_TEST_SUCCESS;
         else if (WEXITSTATUS (ret) == 4)
-            result = CAIRO_TEST_UNTESTED; /* pdfinfo not found, wrong version, missing ref */
+            result = CAIRO_TEST_UNTESTED; /* pdfinfo not found or wrong version */
     }
 
     free (command);

test/reference/pdf-structure-group2.ref.txt

@@ -0,0 +1,4 @@
+H (block)
+  "Heading"
+P (block)
+  "Para1"

test/reference/pdf-structure-group3.ref.txt

@@ -0,0 +1,6 @@
+Document
+  H (block)
+    "Heading"
+  P (block)
+    "Para1"
+  "text"