>From 1807888294d46b8f6bee4150f1f8255496cf416c Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban herbesfolles org>
Date: Sun, 28 Apr 2013 16:29:54 +0200
Subject: [PATCH] Fix tests/testgobject for new object private allocation
 layout

Since 31fde567a95ff8f50b6b0e75d4010da9b73514ed, objects private data
is allocated before the object rather than after:

  [TypeBPrivate] [TypeAPrivate] [[[[GTypeInstance] GObject] TypeA] TypeB]

So, fix the test case to check for the new layout and not the old one,
which obviously fails.
---
 tests/testgobject.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/testgobject.c b/tests/testgobject.c
index 39e10d1..d3f6528 100644
--- a/tests/testgobject.c
+++ b/tests/testgobject.c
@@ -208,7 +208,7 @@ test_object_init (TestObject *tobject)
   priv = TEST_OBJECT_GET_PRIVATE (tobject);
 
   g_assert (priv);
-  g_assert ((gchar *)priv >= (gchar *)tobject + sizeof (TestObject));
+  g_assert ((gchar *)priv + sizeof (TestObjectPrivate) <= (gchar *)tobject);
 
   priv->dummy1 = 54321;
 }
@@ -361,12 +361,12 @@ derived_object_init (DerivedObject *dobject)
   derived_priv = DERIVED_OBJECT_GET_PRIVATE (dobject);
 
   g_assert (derived_priv);
-  g_assert ((gchar *)derived_priv >= (gchar *)TEST_OBJECT_GET_PRIVATE (dobject) + sizeof (TestObjectPrivate));
+  g_assert ((gchar *)derived_priv + sizeof (DerivedObjectPrivate) <= (gchar *)TEST_OBJECT_GET_PRIVATE (dobject));
 
   test_priv = TEST_OBJECT_GET_PRIVATE (dobject);
   
   g_assert (test_priv);
-  g_assert ((gchar *)test_priv >= (gchar *)dobject + sizeof (TestObject));
+  g_assert ((gchar *)test_priv + sizeof (TestObjectPrivate) <= (gchar *)dobject);
 
 }
 
-- 
1.7.10.4