fontconfig: Branch 'main' - 6 commits

[GitLab Mirror]

 .gitlab-ci/build.sh |   14 +++++++++++++-
 test/meson.build    |   14 +++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 5a815ae6d5063e5aadaac4ec33eb32d063a0e6bc
Merge: 759f1b0 767f76d
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 8 09:24:00 2025 +0000

    Merge branch 'ci-missing-deps' into 'main'
    
    CI: missing deps
    
    See merge request fontconfig/fontconfig!378

commit 767f76dc372a348f6c1bf23baffb0d30d921c3ed
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 8 16:36:24 2025 +0900

    ci: add missing dependency of requests

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index adc1e69..9d1e71b 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -142,7 +142,7 @@ elif [ x"$buildsys" == "xmeson" ]; then
     pip install meson
 #   tomli not required for Python >= 3.11
     pip install tomli
-    pip install pytest pytest-tap
+    pip install pytest pytest-tap requests
     for i in "${enable[@]}"; do
         buildopt+=(-D$i=enabled)
 
commit 24e023dba6db19976cc6245de9f71a5cfb1077cd
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 8 01:54:22 2025 +0900

    ci: fix too many open files on test

diff --git a/test/meson.build b/test/meson.build
index d190418..2daf683 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,12 +8,15 @@ tests = [
   ['test-issue180.c'],
   ['test-family-matching.c'],
 ]
+tests_not_parallel = []
 
 if host_machine.system() != 'windows'
   tests += [
     # FIXME: ['test-migration.c'],
     ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}],
     ['test-issue107.c'], # FIXME: fails on mingw
+  ]
+  tests_not_parallel += [
     # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh
     ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread
   ]
@@ -27,7 +30,7 @@ if host_machine.system() != 'windows'
 endif
 
 
-foreach test_data : tests
+foreach test_data : tests + tests_not_parallel
   fname = test_data[0]
   opts = test_data.length() > 1 ? test_data[1] : {}
   extra_c_args = opts.get('c_args', [])
@@ -41,7 +44,11 @@ foreach test_data : tests
     dependencies: extra_deps,
   )
 
-  test(test_name, exe, timeout: 600)
+  if test_data in tests
+    test(test_name, exe, timeout: 600, is_parallel: true)
+  else
+    test(test_name, exe, timeout: 600, is_parallel: false)
+  endif
 endforeach
 
 
commit e2a8cd9a1078b0d388378122a1d2e0785e83a51a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 8 01:22:28 2025 +0900

    ci: Set more timeout for pytest

diff --git a/test/meson.build b/test/meson.build
index 313ad2b..d190418 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -67,7 +67,8 @@ if host_machine.system() != 'windows'
     test('pytest', pytest, args: ['--tap'],
          workdir: meson.current_source_dir(),
          env: ['builddir=@0@'.format(meson.current_build_dir())],
-         protocol: 'tap')
+         protocol: 'tap',
+         timeout: 600)
   endif
 endif
 
commit 25462406aa58898fb1024942efa87fa8f4b56e0c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 7 20:25:34 2025 +0900

    ci: add missing dependency of pytest

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index cc9a15d..adc1e69 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -142,6 +142,7 @@ elif [ x"$buildsys" == "xmeson" ]; then
     pip install meson
 #   tomli not required for Python >= 3.11
     pip install tomli
+    pip install pytest pytest-tap
     for i in "${enable[@]}"; do
         buildopt+=(-D$i=enabled)
 
commit 0e8a50f53af823f851087b0b3b3114918824d598
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 7 20:24:33 2025 +0900

    ci: detect OS from os-release if no FC_DISTRO_NAME is set

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 2de7a23..cc9a15d 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -28,6 +28,17 @@ export BUILD_ID=${BUILD_ID:-fontconfig-$$}
 export PREFIX=${PREFIX:-$MyPWD/prefix}
 export BUILDDIR=${BUILDDIR:-$MyPWD/build}
 
+if [ "x$FC_DISTRO_NAME" = "x" ]; then
+    . /etc/os-release || :
+    FC_DISTRO_NAME=$ID
+fi
+if [ "x$FC_DISTRO_NAME" = "x" ]; then
+    echo "***"
+    echo "*** Unable to detect OS. cross-compiling may not work. Please consider setting FC_DISTRO_NAME"
+    echo "***"
+    sleep 3
+fi
+
 while getopts a:cCe:d:hINs:t:X: OPT
 do
     case $OPT in
@@ -42,7 +53,7 @@ do
         't') type=$OPTARG ;;
         'X') backend=$OPTARG ;;
         'h')
-            echo "Usage: $0 [-a ARCH] [-c] [-e OPT] [-d OPT] [-I] [-s BUILDSYS] [-t BUILDTYPE] [-X XMLBACKEND]"
+            echo "Usage: $0 [-a ARCH] [-c] [-C] [-e OPT] [-d OPT] [-h] [-I] [-N] [-s BUILDSYS] [-t BUILDTYPE] [-X XMLBACKEND]"
             exit 1
             ;;
     esac