|
 |
2d3b65 |
From 4ef58e5661849317a1110c9b93957f2c608677dd Mon Sep 17 00:00:00 2001
|
|
|
2d3b65 |
From: Simon McVittie <smcv@collabora.com>
|
|
|
2d3b65 |
Date: Thu, 3 Jan 2019 08:21:40 +0000
|
|
|
2d3b65 |
Subject: [PATCH 2/2] gvariant test: Also force alignment for tuple test data
|
|
|
2d3b65 |
|
|
|
2d3b65 |
glib!552 (commit 9eed22b3) fixed this for the tests that failed on i686,
|
|
|
2d3b65 |
but this additional test failed on Debian's s390x port
|
|
|
2d3b65 |
(IBM z/Architecture, 64-bit big-endian).
|
|
|
2d3b65 |
|
|
|
2d3b65 |
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
|
2d3b65 |
---
|
|
|
2d3b65 |
glib/tests/gvariant.c | 7 +++++--
|
|
|
2d3b65 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
2d3b65 |
|
|
|
2d3b65 |
diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
|
|
|
2d3b65 |
index a7b19826d..c4a996c1f 100644
|
|
|
2d3b65 |
--- a/glib/tests/gvariant.c
|
|
|
2d3b65 |
+++ b/glib/tests/gvariant.c
|
|
|
2d3b65 |
@@ -4820,6 +4820,7 @@ test_normal_checking_array_offsets (void)
|
|
|
2d3b65 |
static void
|
|
|
2d3b65 |
test_normal_checking_tuple_offsets (void)
|
|
|
2d3b65 |
{
|
|
|
2d3b65 |
+ gpointer aligned_data;
|
|
|
2d3b65 |
const guint8 data[] = {
|
|
|
2d3b65 |
0x07, 0xe5, 0x00, 0x07, 0x00, 0x07,
|
|
|
2d3b65 |
'(', 'a', 's', 'a', 's', 'a', 's', 'a', 's', 'a', 's', 'a', 's', ')',
|
|
|
2d3b65 |
@@ -4828,13 +4829,15 @@ test_normal_checking_tuple_offsets (void)
|
|
|
2d3b65 |
GVariant *variant = NULL;
|
|
|
2d3b65 |
GVariant *normal_variant = NULL;
|
|
|
2d3b65 |
|
|
|
2d3b65 |
- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
|
|
|
2d3b65 |
- FALSE, NULL, NULL);
|
|
|
2d3b65 |
+ aligned_data = g_memdup (data, size); /* guarantee alignment */
|
|
|
2d3b65 |
+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data,
|
|
|
2d3b65 |
+ size, FALSE, NULL, NULL);
|
|
|
2d3b65 |
g_assert_nonnull (variant);
|
|
|
2d3b65 |
|
|
|
2d3b65 |
normal_variant = g_variant_get_normal_form (variant);
|
|
|
2d3b65 |
g_assert_nonnull (normal_variant);
|
|
|
2d3b65 |
|
|
|
2d3b65 |
+ g_free (aligned_data);
|
|
|
2d3b65 |
g_variant_unref (normal_variant);
|
|
|
2d3b65 |
g_variant_unref (variant);
|
|
|
2d3b65 |
}
|
|
|
2d3b65 |
--
|
|
|
2d3b65 |
2.19.1
|
|
|
2d3b65 |
|