Merge lp:~compiz-team/compiz/compiz.fix_python_tests_failing_in_chroots into lp:compiz/0.9.8

[Sam Spilsbury]

Fix some problems with python tests failing in chroots

1) Don't allow duplicate symbols
2) Set environment variables properly so that we always use the ini backend
3) Always use the specified testing config file for compizconfig

== Problem ==

Python tests fail non-determininstically in chroots

== Solution ==

  Fix some problems with python tests failing in chroots

  1) Don't allow duplicate symbols
  2) Set environment variables properly so that we always use the ini backend
  3) Always use the specified testing config file for compizconfig

== Test ==

Already covered by python tests

UNBLOCK

[lp:~compiz-team/compiz/compiz.fix_python_tests_failing_in_chroots]

3295. By Sam Spilsbury on 2012-07-27

Be more pythonic

[Daniel van Vugt (vanvugt)]

Works OK, but I'm a little concerned about dynamic linkage to locally built libraries in test cases:
add_library (gsettings_backend_shared SHARED

This means we're either relying on an LD_LIBRARY_PATH that is implicitly set (I don't see one) or the hardcoding of library paths (the source build directory) into our binaries.

How do we ensure tests find the right libgsettings_backend_shared.so at runtime?

review: Needs Information

[Sam Spilsbury (smspillaz)]

> Works OK, but I'm a little concerned about dynamic linkage to locally built
> libraries in test cases:
> add_library (gsettings_backend_shared SHARED
>
> This means we're either relying on an LD_LIBRARY_PATH that is implicitly set
> (I don't see one) or the hardcoding of library paths (the source build
> directory) into our binaries.
>
> How do we ensure tests find the right libgsettings_backend_shared.so at
> runtime?

The library is installed in the right place.

46 + install (TARGETS gsettings_backend_shared
47 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

[Daniel van Vugt (vanvugt)]

That's not relevant. Tests don't use the install tree. They use the build tree.

[Sam Spilsbury (smspillaz)]

> That's not relevant. Tests don't use the install tree. They use the build
> tree.

Oh ok.

In terms of the build tree, the right libraries are automatically pulled in at runtime, since libgsettings.so is linked to libgsettings_backend_shared.so (which resolves to the local version inside the build tree, and then is re-linked at install time).

Also from what I've read its not possible to change LD_LIBRARY_PATH at runtime anyways, you need to use a wrapper to do it, which isn't very valgrind friendly.

Unmerged revisions

3295. By Sam Spilsbury on 2012-07-27

Be more pythonic

3294. By Sam Spilsbury on 2012-07-25

Fix some problems with python tests failing in chroots

1) Don't allow duplicate symbols
2) Set environment variables properly so that we always use the ini backend
3) Always use the specified testing config file for compizconfig

=== modified file 'compizconfig/compizconfig-python/tests/compiz_config_test.py'
--- compizconfig/compizconfig-python/tests/compiz_config_test.py	2012-07-07 05:53:00 +0000
+++ compizconfig/compizconfig-python/tests/compiz_config_test.py	2012-07-27 08:33:22 +0000
@@ -1,14 +1,18 @@
 import os
+
+os.environ["G_SLICE"] = "always-malloc"
+os.environ["COMPIZ_CONFIG_PROFILE"] = ""
+os.environ["XDG_CONFIG_HOME"] = "compizconfig/libcompizconfig/config"
+os.environ["COMPIZ_METADATA_PATH"] = "generated/"
+os.environ["LIBCOMPIZCONFIG_BACKEND_PATH"] = "compizconfig/libcompizconfig/backend/"
+os.environ["XDG_DATA_DIRS"] = "generated/"
+
 import sys
 import subprocess
 
 arch = subprocess.Popen (["uname", "-p"], stdout=subprocess.PIPE).communicate ()[0][:-1]
 
-os.environ["COMPIZ_METADATA_PATH"] = "generated/"
-os.environ["LIBCOMPIZCONFIG_BACKEND_PATH"] = "compizconfig/libcompizconfig/backend/"
-os.environ["XDG_DATA_DIRS"] = "generated/"
-
-sys.path.append ("compizconfig/compizconfig-python/build/lib.linux-" + arch + "-" + str (sys.version_info[0]) + "." + str (sys.version_info[1]) + "/")
+sys.path.insert (0, "compizconfig/compizconfig-python/build/lib.linux-%s-%s.%s/" % (arch, sys.version_info[0], sys.version_info[1]))
 
 import unittest
 import compizconfig

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-07-05 21:11:17 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-07-27 08:33:22 +0000
@@ -15,12 +15,24 @@
     link_directories (${GSETTINGS_UTIL_LIBRARY_DIRS}
 		      ${compiz_BINARY_DIR}/compizconfig/libcompizconfig)
 
-    add_library (gsettings_backend_shared STATIC
+    add_library (gsettings_backend_shared SHARED
 		 ${CMAKE_CURRENT_SOURCE_DIR}/gsettings_constants.c
 		 ${CMAKE_CURRENT_SOURCE_DIR}/gsettings_util.c)
 
+
     target_link_libraries (gsettings_backend_shared
 			   ${GSETTINGS_UTIL_LIBRARIES}
 			   compizconfig)
 
+    install (TARGETS gsettings_backend_shared
+	     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+
+    #
+    # Tell CMake that targets using gsettings_backend_shared should NOT re-import the
+    # libraries that gsettings_backend_shared depends on (contains).
+    #
+    set_target_properties (gsettings_backend_shared PROPERTIES
+	LINK_INTERFACE_LIBRARIES ""
+    )
+
 endif (GSETTINGS_UTIL_FOUND)

=== modified file 'compizconfig/libcompizconfig/config/CMakeLists.txt'
--- compizconfig/libcompizconfig/config/CMakeLists.txt	2012-05-24 06:48:55 +0000
+++ compizconfig/libcompizconfig/config/CMakeLists.txt	2012-07-27 08:33:22 +0000
@@ -1,6 +1,9 @@
 set (_config_file
      config)
 
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config_test
+		${CMAKE_CURRENT_BINARY_DIR}/compiz-1/compizconfig/config)
+
 compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
 
 add_custom_target (

=== added file 'compizconfig/libcompizconfig/config/config_test'
--- compizconfig/libcompizconfig/config/config_test	1970-01-01 00:00:00 +0000
+++ compizconfig/libcompizconfig/config/config_test	2012-07-27 08:33:22 +0000
@@ -0,0 +1,3 @@
+[general]
+backend = ini
+plugin_list_autosort = true

=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
--- compizconfig/libcompizconfig/src/CMakeLists.txt	2012-07-03 06:22:53 +0000
+++ compizconfig/libcompizconfig/src/CMakeLists.txt	2012-07-27 08:33:22 +0000
@@ -68,6 +68,14 @@
     compizconfig ${LIBCOMPIZCONFIG_LIBRARIES} m
 )
 
+#
+# Tell CMake that targets using compizconfig should NOT re-import the
+# libraries that compizconfig depends on (contains).
+#
+set_target_properties (compizconfig PROPERTIES
+    LINK_INTERFACE_LIBRARIES ""
+)
+
 set (COMPIZCONFIG_LIBS "")
 foreach (_val ${LIBCOMPIZCONFIG_LDFLAGS})
     set (COMPIZCONFIG_LIBS "${COMPIZCONFIG_LIBS}${_val} ")