git.iko.soy/unity8
on xenial help sign in
More data-dir fixes
40897d6Michael Terry
tests/plugins/GlobalShortcut/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -12,7 +12,7 @@ install(TARGETS GlobalShortcutTestExec
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
13)
13)
14install(FILES shortcut.qml
14install(FILES shortcut.qml
15− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
15+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/GlobalShortcut"
16)
16)
17add_unity8_uitest(GlobalShortcut GlobalShortcutTestExec
17add_unity8_uitest(GlobalShortcut GlobalShortcutTestExec
18 DEPENDS GlobalShortcut-qml
18 DEPENDS GlobalShortcut-qml
tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp+1−1
@@ -32,7 +32,7 @@ private Q_SLOTS:
32 void initTestCase()
32 void initTestCase()
33 {
33 {
34 m_view = new QQuickView();
34 m_view = new QQuickView();
35− m_view->setSource(QUrl::fromLocalFile(testLibDir() + "/" TEST_DIR "/shortcut.qml"));
35+ m_view->setSource(QUrl::fromLocalFile(testDataDir() + "/" TEST_DIR "/shortcut.qml"));
36 m_shortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("shortcut").value<QObject*>());
36 m_shortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("shortcut").value<QObject*>());
37 QVERIFY(m_shortcut);
37 QVERIFY(m_shortcut);
38 m_inactiveShortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("inactiveShortcut").value<QObject*>());
38 m_inactiveShortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("inactiveShortcut").value<QObject*>());
tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1
@@ -18,7 +18,7 @@ install(TARGETS GreeterDBusTestExec
18 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
18 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
19)
19)
20install(FILES greeter.qml
20install(FILES greeter.qml
21− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
21+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/IntegratedLightDM"
22)
22)
23add_unity8_uitest(GreeterDBus dbus-test-runner
23add_unity8_uitest(GreeterDBus dbus-test-runner
24 ARG_PREFIX "--parameter"
24 ARG_PREFIX "--parameter"
tests/plugins/IntegratedLightDM/dbus.cpp+1−1
@@ -59,7 +59,7 @@ private Q_SLOTS:
59 void init()
59 void init()
60 {
60 {
61 view = new QQuickView();
61 view = new QQuickView();
62− view->setSource(QUrl::fromLocalFile(testLibDir() + "/plugins/IntegratedLightDM/greeter.qml"));
62+ view->setSource(QUrl::fromLocalFile(testDataDir() + "/plugins/IntegratedLightDM/greeter.qml"));
63 greeter = dynamic_cast<Greeter*>(view->rootObject()->property("greeter").value<QObject*>());
63 greeter = dynamic_cast<Greeter*>(view->rootObject()->property("greeter").value<QObject*>());
64 QVERIFY(greeter);
64 QVERIFY(greeter);
65 QVERIFY(greeter->authenticationUser() == "");
65 QVERIFY(greeter->authenticationUser() == "");
tests/plugins/ScreenGrabber/CMakeLists.txt+1−1
@@ -12,6 +12,6 @@ install(TARGETS ScreenGrabberTestExec
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/ScreenGrabber"
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/ScreenGrabber"
13)
13)
14install(FILES grabber.qml
14install(FILES grabber.qml
15− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/ScreenGrabber"
15+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/ScreenGrabber"
16)
16)
17add_unity8_uitest(ScreenGrabber ScreenGrabberTestExec DEPENDS ScreenGrabber-qml)
17add_unity8_uitest(ScreenGrabber ScreenGrabberTestExec DEPENDS ScreenGrabber-qml)
tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp+1−1
@@ -32,7 +32,7 @@ private Q_SLOTS:
32 void initTestCase()
32 void initTestCase()
33 {
33 {
34 m_view = new QQuickView();
34 m_view = new QQuickView();
35− m_view->setSource(QUrl::fromLocalFile(testLibDir() + "/" TEST_DIR "/grabber.qml"));
35+ m_view->setSource(QUrl::fromLocalFile(testDataDir() + "/" TEST_DIR "/grabber.qml"));
36 m_grabber = dynamic_cast<ScreenGrabber*>(m_view->rootObject()->property("grabber").value<QObject*>());
36 m_grabber = dynamic_cast<ScreenGrabber*>(m_view->rootObject()->property("grabber").value<QObject*>());
37 QVERIFY(m_grabber);
37 QVERIFY(m_grabber);
38 m_view->show();
38 m_view->show();