All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/6] pango: fix markup-parse test case
@ 2019-03-04 17:31 Ross Burton
  2019-03-04 17:31 ` [PATCH 2/6] packagegroup-self-hosted: remove lrzsz Ross Burton
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Ross Burton @ 2019-03-04 17:31 UTC (permalink / raw)
  To: openembedded-core

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../pango/pango/insensitive-diff.patch             | 28 ++++++++++++++++++++++
 meta/recipes-graphics/pango/pango_1.42.4.bb        |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/pango/pango/insensitive-diff.patch

diff --git a/meta/recipes-graphics/pango/pango/insensitive-diff.patch b/meta/recipes-graphics/pango/pango/insensitive-diff.patch
new file mode 100644
index 00000000000..faaa96133f9
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango/insensitive-diff.patch
@@ -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);
diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb
index e181bcb5005..d3357f82de9 100644
--- a/meta/recipes-graphics/pango/pango_1.42.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.42.4.bb
@@ -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"
 
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-04 17:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-04 17:31 [PATCH 1/6] pango: fix markup-parse test case Ross Burton
2019-03-04 17:31 ` [PATCH 2/6] packagegroup-self-hosted: remove lrzsz Ross Burton
2019-03-04 17:31 ` [PATCH 3/6] packagegroup-core-tools-testapps: " Ross Burton
2019-03-04 17:31 ` [PATCH 4/6] mtd-utils: add lzo PACKAGECONFIG Ross Burton
2019-03-04 17:31 ` [PATCH 5/6] util-linux: remove spurious lzo-native dependency Ross Burton
2019-03-04 17:31 ` [PATCH 6/6] squashfs-tools: add PACKAGECONFIGs for all the tunables Ross Burton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.