@@ -52,7 +52,11 @@ def get_mocks_library_path():
5252 if running_installed_tests():
5353 mock_path = "qml/mocks/"
5454 else:
55− mock_path = "../lib/x86_64-linux-gnu/unity8/qml/mocks/"
55+ mock_path = os.path.join(
56+ "../lib/",
57+ sysconfig.get_config_var('MULTIARCH'),
58+ "/unity8/qml/mocks/"
59+ )
5660 lib_path = get_lib_path()
5761 ld_library_path = os.path.abspath(
5862 os.path.join(
@@ -83,6 +87,17 @@ def get_binary_path(binary="unity8"):
8387 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))
8488 return binary_path
8589
90+def get_data_dirs():
91+ """Prepend a mock data path to XDG_DATA_DIRS."""
92+ data_path = os.path.abspath(
93+ os.path.join(os.path.dirname(__file__),
94+ running_installed_tests() and "/usr/share/unity8/mocks/data" or "../../mocks/data"
95+ ))
96+ xdg_path = os.getenv("XDG_DATA_DIRS")
97+ if xdg_path:
98+ return "{0}:{1}".format(data_path, xdg_path)
99+ else:
100+ return data_path
86101
87102def get_grid_size():
88103 grid_size = os.getenv('GRID_UNIT_PX')