Merge lp:~bregma/geis/fix-integration-tests into lp:geis

[Stephen M. Webb]

These changes bring utouch-geis to the point where the entire test suite runs green on my local machine, at least under the following conditions.

(1) No other X server grabs the input devices. Running from a text console (VT) prevents this. Failures due to this are not failures in the uTouch stack.

(2) The captive X server will not shut down and start rapidly. All tests pass if run separately or when built and run in the same pass, but some tests will not start if run too rapidly together. This is effectively a failure of the test harness and not indicative of problems in the uTouch stack.

The changes include here include (1) setting the appropriate libraries so the testsuite will build, and (2) changing the order of teardown of some contained objects to avoid both a circular dependency in refcounted objects that sometimes caused a resource loss (no X connection teardown, memory leaks) and also a double-delete or reference of as deleted object.

[Chase Douglas (chasedouglas)]

It all looks reasonable to me.

I think we may need some work on xorg-gtest to make it a bit more robust. There are circumstances where the X server doesn't always shut down, and perhaps it should be starting server on a random port that is unused.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-03-29 16:31:42 +0000
+++ configure.ac	2012-03-31 01:59:21 +0000
@@ -100,7 +100,7 @@
 have_xorg_gtest=no
 AS_IF([test "x$enable_integration_tests" != xno],
       [CHECK_XORG_GTEST(
-          [],
+          [AC_SUBST(XORG_GTEST_LIBS, [-pthread])],
           [AS_IF([test "x$enable_integration_tests" = xyes],
                  [AC_MSG_ERROR(
                      [xorg-gtest is not available])],

=== modified file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	2012-03-25 21:12:43 +0000
+++ libutouch-geis/geis.c	2012-03-31 01:59:21 +0000
@@ -762,7 +762,7 @@
   if (geis->backend)
     geis_backend_delete(geis->backend);
   if (geis->server)
-      geis_dbus_server_delete(geis->server);
+    geis_dbus_server_delete(geis->server);
   geis_filterable_attribute_bag_delete(geis->special_filterable_attributes);
   geis_filterable_attribute_bag_delete(geis->region_filterable_attributes);
   geis_device_bag_delete(geis->devices);
@@ -774,7 +774,8 @@
   close(geis->input_event_signal_pipe[1]);
   geis_event_queue_delete(geis->input_event_queue);
   geis_backend_multiplexor_delete(geis->backend_multiplexor);
-  geis_subscription_bag_delete(geis->subscription_bag);
+  if (geis->subscription_bag)
+    geis_subscription_bag_delete(geis->subscription_bag);
   free(geis);
 }
 
@@ -789,7 +790,18 @@
     return GEIS_STATUS_BAD_ARGUMENT;
   }
 
-  geis_subscription_bag_invalidate(geis->subscription_bag);
+  /* break circular dependencies */
+  if (geis->subscription_bag)
+  {
+    geis_subscription_bag_delete(geis->subscription_bag);
+    geis->subscription_bag = NULL;
+  }
+  if (geis->backend)
+  {
+    geis_backend_delete(geis->backend);
+    geis->backend = NULL;
+  }
+
   geis_unref(geis);
   return GEIS_STATUS_SUCCESS;
 }
@@ -1103,12 +1115,6 @@
   return geis_subscription_bag_insert(geis->subscription_bag, subscription);
 }
 
-void
-geis_remove_subscription(Geis geis, GeisSubscription subscription)
-{
-  geis_subscription_bag_remove(geis->subscription_bag, subscription);
-}
-
 
 /*
  * Creates a new backend token.

=== modified file 'libutouch-geis/geis_private.h'
--- libutouch-geis/geis_private.h	2012-03-13 16:44:03 +0000
+++ libutouch-geis/geis_private.h	2012-03-31 01:59:21 +0000
@@ -75,14 +75,6 @@
 GeisSize geis_add_subscription(Geis geis, GeisSubscription subscription);
 
 /**
- * Removes a subscription from the API instance.
- *
- * @param[in] geis  The API instance.
- * @param[in] subscription  A GEIS subscirption.
- */
-void geis_remove_subscription(Geis geis, GeisSubscription subscription);
-
-/**
  * Adds a back end file descriptor to multiplex.
  *
  * @param[in] geis     The API instance.

=== modified file 'libutouch-geis/geis_subscription.c'
--- libutouch-geis/geis_subscription.c	2011-10-17 21:17:25 +0000
+++ libutouch-geis/geis_subscription.c	2012-03-31 01:59:21 +0000
@@ -428,7 +428,6 @@
   geis_subscription_deactivate(sub);
   if (sub->sub_geis != NULL)
   {
-    geis_remove_subscription(sub->sub_geis, sub);
     geis_unref(sub->sub_geis);
   }
   if (sub->sub_filters != NULL)