Ubuntu Notes app

Merge lp:~nskaggs/reminders-app/add-testability-driver into lp:reminders-app

  1. add-testability-driver
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~nskaggs/reminders-app/add-testability-driver
Merge into: lp:reminders-app
Diff against target: 33 lines (+16/-0)
1 file modified
src/app/main.cpp (+16/-0)
To merge this branch: bzr merge lp:~nskaggs/reminders-app/add-testability-driver
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Notes app developers Pending
Review via email: mp+211428@code.launchpad.net

Commit message

Add check for testability driver when loading binary to ensure autopilot introspection works

Description of the change

Add check for testability driver when loading binary to ensure autopilot introspection works

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Redid this mp to be clean, sorry about the previous proposal :=)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:87
http://91.189.93.70:8080/job/reminders-app-ci/228/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1770
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/228
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/228

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/228/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:
http://91.189.93.70:8080/job/reminders-app-ci/230/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1773
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/230
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/230

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/230/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/main.cpp'
2--- src/app/main.cpp 2014-03-13 19:49:44 +0000
3+++ src/app/main.cpp 2014-03-17 22:27:51 +0000
4@@ -26,6 +26,7 @@
5 #include <QtGui/QGuiApplication>
6 #include <QtQuick/QQuickView>
7 #include <QtQml/QtQml>
8+#include <QLibrary>
9
10 #include <QDebug>
11
12@@ -64,6 +65,21 @@
13 }
14 }
15
16+ if (args.contains(QLatin1String("-testability")) || getenv("QT_LOAD_TESTABILITY")) {
17+ QLibrary testLib(QLatin1String("qttestability"));
18+ if (testLib.load()) {
19+ typedef void (*TasInitialize)(void);
20+ TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
21+ if (initFunction) {
22+ initFunction();
23+ } else {
24+ qCritical("Library qttestability resolve failed!");
25+ }
26+ } else {
27+ qCritical("Library qttestability load failed!");
28+ }
29+ }
30+
31 view.engine()->rootContext()->setContextProperty("tablet", false);
32 view.engine()->rootContext()->setContextProperty("phone", false);
33 if (args.contains("-t") || args.contains("--tablet")) {

Subscribers

People subscribed via source and target branches