Merge lp:~thomas-voss/trust-store/test-tp into lp:trust-store

[Thomas Voß]

Minimize trust-prompt for testing/debugging purposes.

Minimize trust-prompt for testing/debugging purposes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/trust-store-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/114/rebuild

review: Approve (continuous-integration)

Unmerged revisions

150. By Thomas Voß on 2016-03-24

Minimize trust-prompt for testing/debugging purposes.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-11 09:51:51 +0000
+++ src/CMakeLists.txt	2016-03-24 16:18:17 +0000
@@ -111,6 +111,7 @@
     trust-prompt
 
     ${Boost_LIBRARIES}
+    ${MIR_CLIENT_LDFLAGS}
     ${PROCESS_CPP_LDFLAGS}
   )
 

=== modified file 'src/core/trust/mir/prompt_main.cpp'
--- src/core/trust/mir/prompt_main.cpp	2015-11-26 15:25:34 +0000
+++ src/core/trust/mir/prompt_main.cpp	2016-03-24 16:18:17 +0000
@@ -36,6 +36,8 @@
 
 #include <core/posix/this_process.h>
 
+#include <mirclient/mir_toolkit/mir_client_library.h>
+
 #include "prompt_config.h"
 #include "prompt_main.h"
 
@@ -176,7 +178,15 @@
         }
     });
 
-    // We already parsed the command line arguments and do not parse them
+    auto connection = mir_connect_sync("", "ThisIsJustATest");
+
+    if (not mir_connection_is_valid(connection))
+        return EXIT_FAILURE;
+
+    mir_connection_release(connection);
+    return EXIT_SUCCESS;
+
+    /*// We already parsed the command line arguments and do not parse them
     // to the application.
     QGuiApplication app{argc, argv};
 
@@ -227,7 +237,7 @@
                 &signal_trap,
                 SLOT(quit(int)));
 
-    return app.exec();
+    return app.exec();*/
 }
 
 #include "prompt_main.moc"