@@ -39,8 +39,7 @@ class ShellTestCase(AutopilotTestCase):
39 self.launch_test_local(geometry)
39 self.launch_test_local(geometry)
41 def launch_test_local(self, geometry):
41 def launch_test_local(self, geometry):
42− os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib:../../builddir/tests/mocks/LightDM/" + self.lightdm_mock
42+ os.environ['LD_LIBRARY_PATH'] = "../../builddir/tests/mocks/LightDM/" + self.lightdm_mock
43− os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
44 if geometry != "0x0":
43 if geometry != "0x0":
45 self.app = self.launch_test_application(
44 self.app = self.launch_test_application(
46 "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')
45 "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')
@@ -50,7 +49,6 @@ class ShellTestCase(AutopilotTestCase):
51 def launch_test_installed(self, geometry):
50 def launch_test_installed(self, geometry):
52 os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock
51 os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock
53− os.environ['QML2_IMPORT_PATH'] = "/usr/share/unity8/plugins/mocks:/usr/share/unity8/plugins"
54 if model() == 'Desktop' and geometry != "0x0":
52 if model() == 'Desktop' and geometry != "0x0":
55 self.app = self.launch_test_application(
53 self.app = self.launch_test_application(
56 "unity8", "-geometry", geometry, "-frameless", app_type='qt')
54 "unity8", "-geometry", geometry, "-frameless", app_type='qt')