Merge lp:~compiz-team/compiz/compiz.0.9.8.disable_failing_tests_due_to_distro_patch into lp:compiz/0.9.9

[Sam Spilsbury]

Disable failing tests due to distro patch

As discussed with didrocks, we cannot remove the primary_is_control.patch distro patch for the sake of fixing failing tests, so this just disables those tests from running on the stable branch so that we can get CI green there again.

Unmerged revisions

=== modified file 'VERSION'
--- VERSION	2012-09-28 05:23:46 +0000
+++ VERSION	2012-10-02 06:37:19 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 0.9.9
+=======
+0.9.8.5
+>>>>>>> MERGE-SOURCE
 
=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-09-25 03:42:20 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-10-02 06:37:19 +0000
@@ -827,7 +827,7 @@
 {
 };
 
-TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
 {
     const std::string                   settingName (GetParam ().settingName);
     boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));