* commit d202953c47284a17d03dd2d14b67756aa5edc872
|\ Merge: 8723aba59 4ef58e566
| | Author: Simon McVittie <email address hidden>
| | Date: Fri Jan 4 14:14:56 2019 +0000
| |
| | Merge branch 'backport-552-gvariant-test-alignment-glib-2-56' into 'glib-2-56'
| |
| | Backport tests: Allocate gvariant data from the heap to guarantee alignment to glib-2-56
| |
| | See merge request GNOME/glib!557
| |
| * commit 4ef58e5661849317a1110c9b93957f2c608677dd
| | Author: Simon McVittie <email address hidden>
| | Date: Thu Jan 3 08:21:40 2019 +0000
| |
| | gvariant test: Also force alignment for tuple test data
| |
| | glib!552 (commit 9eed22b3) fixed this for the tests that failed on i686,
| | but this additional test failed on Debian's s390x port
| | (IBM z/Architecture, 64-bit big-endian).
| |
| | Signed-off-by: Simon McVittie <email address hidden>
| |
| * commit 85c4031696add9797e2334ced20678edcd96c869
|/ Author: Mart Raudsepp <email address hidden>
| Date: Wed Dec 19 16:22:21 2018 +0200
|
| tests: Allocate gvariant data from the heap to guarantee alignment
|
| On glib-2-58 branch we don't have !455, thus we need aligned data
| for the gvariant tests to not fail on i686.
|
| Fixes #1626
bah, it failed on i386 and s390x:
Bail out! GLib:ERROR: ../../. ./../glib/ gvariant- serialiser. c:174:g_ variant_ serialised_ check: assertion failed (alignment & (gsize) serialised.data == 0): (3 == 0) ../../. ./../glib/ gvariant- serialiser. c:174:g_ variant_ serialised_ check: assertion failed (alignment & (gsize) serialised.data == 0): (3 == 0)
ERROR: gvariant - Bail out! GLib:ERROR:
I guess we need these from the branch:
* commit d202953c47284a1 7d03dd2d14b6775 6aa5edc872 552-gvariant- test-alignment- glib-2- 56' into 'glib-2-56' 7a1110c9b93957f 2c608677dd 97e2334ced20678 edcd96c869
|\ Merge: 8723aba59 4ef58e566
| | Author: Simon McVittie <email address hidden>
| | Date: Fri Jan 4 14:14:56 2019 +0000
| |
| | Merge branch 'backport-
| |
| | Backport tests: Allocate gvariant data from the heap to guarantee alignment to glib-2-56
| |
| | See merge request GNOME/glib!557
| |
| * commit 4ef58e566184931
| | Author: Simon McVittie <email address hidden>
| | Date: Thu Jan 3 08:21:40 2019 +0000
| |
| | gvariant test: Also force alignment for tuple test data
| |
| | glib!552 (commit 9eed22b3) fixed this for the tests that failed on i686,
| | but this additional test failed on Debian's s390x port
| | (IBM z/Architecture, 64-bit big-endian).
| |
| | Signed-off-by: Simon McVittie <email address hidden>
| |
| * commit 85c4031696add97
|/ Author: Mart Raudsepp <email address hidden>
| Date: Wed Dec 19 16:22:21 2018 +0200
|
| tests: Allocate gvariant data from the heap to guarantee alignment
|
| On glib-2-58 branch we don't have !455, thus we need aligned data
| for the gvariant tests to not fail on i686.
|
| Fixes #1626
probably.