mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
pango: fix markup-parse test case
The test case expects that printf(0x0) is (null) but for us this it is (NULL). Use case-insensitive diff as the rest of the tests don't care about case. (From OE-Core rev: b19a6501599ba7567c7c7d1456b62a8702a7e82a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c3acb677fa
commit
ce1487f4ae
28
meta/recipes-graphics/pango/pango/insensitive-diff.patch
Normal file
28
meta/recipes-graphics/pango/pango/insensitive-diff.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed
|
||||
as (null) or (NULL).
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/tests/markup-parse.c b/tests/markup-parse.c
|
||||
index 633f3e89..36d2c776 100644
|
||||
--- a/tests/markup-parse.c
|
||||
+++ b/tests/markup-parse.c
|
||||
@@ -217,7 +217,7 @@ diff_with_file (const char *file1,
|
||||
GString *string,
|
||||
GError **error)
|
||||
{
|
||||
- const char *command[] = { "diff", "-u", file1, NULL, NULL };
|
||||
+ const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL };
|
||||
char *diff, *tmpfile;
|
||||
int fd;
|
||||
|
||||
@@ -237,7 +237,7 @@ diff_with_file (const char *file1,
|
||||
goto done;
|
||||
}
|
||||
close (fd);
|
||||
- command[3] = tmpfile;
|
||||
+ command[4] = tmpfile;
|
||||
|
||||
/* run diff command */
|
||||
g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);
|
||||
@@ -16,7 +16,8 @@ GNOMEBASEBUILDCLASS = "meson"
|
||||
inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
|
||||
|
||||
SRC_URI += "file://run-ptest \
|
||||
"
|
||||
file://insensitive-diff.patch"
|
||||
|
||||
SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
|
||||
SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user