mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 14:56:46 +02:00
66e193260a
glib now needs to be built in two stages, first without gobject introspection and then a second build with introspection. Also enable and fix tests ref: https://gitlab.gnome.org/GNOME/glib/-/issues/3317 ref: https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS?ref_type=heads#L296
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
https://gitlab.gnome.org/GNOME/glib/-/issues/3318
|
|
https://gitlab.gnome.org/GNOME/glib/-/issues/3320
|
|
|
|
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
|
|
index 85f40d2e1..059a786d3 100644
|
|
--- a/glib/tests/meson.build
|
|
+++ b/glib/tests/meson.build
|
|
@@ -54,6 +54,7 @@ glib_tests = {
|
|
'gwakeup' : {
|
|
'source' : ['gwakeuptest.c', '../gwakeup.c'],
|
|
'install' : false,
|
|
+ 'can_fail': host_machine.cpu_family() == 's390x',
|
|
},
|
|
'hash' : {},
|
|
'hmac' : {},
|
|
@@ -226,6 +227,7 @@ if glib_conf.has('HAVE_EVENTFD')
|
|
'source' : ['gwakeuptest.c', '../gwakeup.c'],
|
|
'c_args' : ['-DTEST_EVENTFD_FALLBACK'],
|
|
'install' : false,
|
|
+ 'can_fail': host_machine.cpu_family() == 's390x',
|
|
},
|
|
}
|
|
endif
|
|
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
|
|
index a163e5f91..12c449519 100644
|
|
--- a/gobject/tests/meson.build
|
|
+++ b/gobject/tests/meson.build
|
|
@@ -78,7 +78,7 @@ gobject_tests = {
|
|
'references' : {},
|
|
'basic-signals' : {},
|
|
'singleton' : {},
|
|
- 'threadtests' : {},
|
|
+ 'threadtests' : { 'can_fail': 'aarch64' in host_machine.cpu_family() or 'riscv' in host_machine.cpu_family() },
|
|
'dynamictests' : {},
|
|
'binding' : {},
|
|
'bindinggroup' : {},
|
|
From ad2925ef361a7c889ff696a1ba9e677accaecd08 Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Thu, 4 Apr 2024 10:15:07 +0200
|
|
Subject: [PATCH] tests: increase timeout on slow architectures
|
|
|
|
Prevent tests to timeout on architectures that are slow.
|
|
|
|
Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/3319
|
|
|
|
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
|
---
|
|
meson.build | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index f0c5e070b..4c6c87766 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -182,6 +182,12 @@ test_protocol = 'tap'
|
|
test_timeout = 30
|
|
test_timeout_slow = 90
|
|
|
|
+# give more time on slow architectures
|
|
+if 'riscv' in host_machine.cpu_family()
|
|
+ test_timeout = test_timeout * 4
|
|
+ test_timeout_slow = test_timeout_slow * 4
|
|
+endif
|
|
+
|
|
add_test_setup('default',
|
|
is_default: true,
|
|
exclude_suites: ['flaky', 'failing'],
|
|
--
|
|
2.44.0
|
|
|
|
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
|
|
index 85f40d2e1..f2ee59678 100644
|
|
--- a/glib/tests/meson.build
|
|
+++ b/glib/tests/meson.build
|
|
@@ -113,6 +113,8 @@ glib_tests = {
|
|
'regex' : {
|
|
'dependencies' : [pcre2],
|
|
'c_args' : use_pcre2_static_flag ? ['-DPCRE2_STATIC'] : [],
|
|
+ # https://gitlab.gnome.org/GNOME/glib/-/issues/3321
|
|
+ 'can_fail': host_machine.cpu_family() == 'riscv64',
|
|
},
|
|
'relation' : {},
|
|
'rwlock' : {},
|