mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib: disable a failing ptest

Browse Source 
The test needs resources that are built by glib using
hardcoded host tools, that was already disabled, so this
patch adds disabing the test that relies on those resources.

(From OE-Core rev: f3d7b605bac2d2a7a11f4079f57f410a6092c49e)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-01-14 15:00:01 +01:00
committed by Richard Purdie
parent bb0b96a586
commit d79803fb61
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch Normal file
View File

@@ -0,0 +1,27 @@
From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 8 Jan 2020 18:22:46 +0100
Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
This test requires building resources in a way that is
not cross-compatible (hardcodes ld and objcopy).
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gio/tests/resources.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index c44d214..e289a01 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -993,7 +993,7 @@ main (int argc,
g_test_add_func ("/resource/automatic", test_resource_automatic);
/* This only uses automatic resources too, so it tests the constructors and destructors */
g_test_add_func ("/resource/module", test_resource_module);
- g_test_add_func ("/resource/binary-linked", test_resource_binary_linked);
+ /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */
#endif
g_test_add_func ("/resource/uri/query-info", test_uri_query_info);
g_test_add_func ("/resource/uri/file", test_uri_file);

2
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
View File

@@ -1,4 +1,4 @@
From dd8c6822d05d65e8db72cbff0b2f3c1088686b6f Mon Sep 17 00:00:00 2001
From 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds

1
meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
View File

@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"