Merge lp:~saviq/unity8/fix-parallel-build into lp:unity8

[Michał Sawicz]

Use targets instead of custom ld arguments for linking

This allows for implied dependencies

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N/A
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/unity8-ci/5375/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/540
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18471

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5375/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
It's a build chain fix only

 * Did CI run pass?
Yes

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'plugins/LightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-01-20 11:50:19 +0000
+++ plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-03-12 17:00:28 +0000
@@ -56,7 +56,8 @@
                 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
         // This next connect is how we pass ResponseFutures between threads
         connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
-                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
+                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
+                Qt::BlockingQueuedConnection);
     }
 
     ~GreeterImpl()
@@ -79,7 +80,7 @@
 
         if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
             appData->handle = pamHandle;
-            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
+            futureWatcher.setFuture(QtConcurrent::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));
         } else {
             delete appData;
             greeterPrivate->authenticated = false;
@@ -88,7 +89,7 @@
         }
     }
 
-    static int authenticateWithPam(pam_handle* pamHandle)
+    static int authenticateWithPam(pam_handle* const& pamHandle)
     {
         int pamStatus = pam_authenticate(pamHandle, 0);
         if (pamStatus == PAM_SUCCESS) {
@@ -242,11 +243,14 @@
 private:
     void cancelPam()
     {
-        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
         if (pamHandle != nullptr) {
             pam_handle *handle = pamHandle;
             pamHandle = nullptr; // to disable normal finishPam() handling
-            while (respond(QString())); // clear our local queue of QFutures
+            futureWatcher.cancel();
+            while (!futureWatcher.isFinished()) {
+                QCoreApplication::processEvents(); // let signal/slot handling happen
+                respond(QString());
+            }
             pam_end(handle, PAM_CONV_ERR);
         }
     }
@@ -266,6 +270,11 @@
 {
 }
 
+GreeterPrivate::~GreeterPrivate()
+{
+    delete m_impl;
+}
+
 void GreeterPrivate::handleAuthenticate()
 {
     m_impl->start(authenticationUser);

=== modified file 'plugins/LightDM/liblightdm/GreeterPrivate.h'
--- plugins/LightDM/liblightdm/GreeterPrivate.h	2015-01-20 11:50:19 +0000
+++ plugins/LightDM/liblightdm/GreeterPrivate.h	2015-03-12 17:00:28 +0000
@@ -30,7 +30,7 @@
 {
 public:
     explicit GreeterPrivate(Greeter* parent=0);
-    virtual ~GreeterPrivate() = default;
+    virtual ~GreeterPrivate();
 
     // These variables may not be used by all subclasses, that's no problem
     bool authenticated;

=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2015-01-27 15:50:02 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2015-03-12 17:00:28 +0000
@@ -34,12 +34,9 @@
 # installed on the system.  So we make sure we link to our full fake version
 # At run time, we can point to whichever version we happen to be using via
 # LD_LIBRARY_PATH.
-add_dependencies(MockLightDM-qml MockLightDM MockUserMetrics)
 target_link_libraries(MockLightDM-qml
-    -L${CMAKE_CURRENT_BINARY_DIR}/liblightdm
-    -llightdm-qt5-2
-    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
-    -lusermetricsoutput
+    MockLightDM
+    MockUserMetrics
     unity8-private
     )
 

=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
--- tests/mocks/Unity/Indicators/CMakeLists.txt	2015-01-20 16:21:07 +0000
+++ tests/mocks/Unity/Indicators/CMakeLists.txt	2015-03-12 17:00:28 +0000
@@ -26,10 +26,8 @@
 )
 add_definitions(-DUNITYINDICATORS_LIBRARY)
 
-add_dependencies(IndicatorsFakeQml QMenuModelQml)
 target_link_libraries(IndicatorsFakeQml
-    -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
-    -lqmenumodel
+    QMenuModelQml
 )
 
 qt5_use_modules(IndicatorsFakeQml Core Qml Quick)

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-02-05 21:13:16 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2015-03-12 17:00:28 +0000
@@ -1,8 +1,37 @@
+add_definitions(
+    -DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
 add_executable(GreeterDBusTestExec
     dbus.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     )
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
+target_link_libraries(GreeterDBusTestExec
+    MockLightDM
+    )
+target_include_directories(GreeterDBusTestExec PUBLIC
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
+    )
+add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
+
+add_executable(GreeterPamTestExec
+    pam.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm/GreeterPrivate.cpp
+    )
+qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
+target_link_libraries(GreeterPamTestExec
+    integratedLightDM
+    )
+target_include_directories(GreeterPamTestExec PUBLIC
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm
+    )
+add_qmltest_target(testGreeterPam "${CMAKE_CURRENT_BINARY_DIR}/GreeterPamTestExec" TRUE FALSE)
+add_dependencies(testGreeterPam GreeterPamTestExec)
 
 add_executable(GreeterUsersModelTestExec
     usersmodel.cpp
@@ -10,26 +39,12 @@
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
+target_link_libraries(GreeterUsersModelTestExec
+    MockLightDM
+    )
+target_include_directories(GreeterUsersModelTestExec PUBLIC
     ${CMAKE_SOURCE_DIR}/plugins/LightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
     ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
     )
-
-target_link_libraries(GreeterDBusTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
-    -llightdm-qt5-2
-    )
-
-target_link_libraries(GreeterUsersModelTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
-    -llightdm-qt5-2
-    )
-
-add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-
-add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
-
 add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")

=== added file 'tests/plugins/LightDM/pam.cpp'
--- tests/plugins/LightDM/pam.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/LightDM/pam.cpp	2015-03-12 17:00:28 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GreeterPrivate.h"
+
+#include <QtTest>
+
+class GreeterPamTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void init()
+    {
+        m_greeterpriv = new QLightDM::GreeterPrivate();
+    }
+
+    void cleanup()
+    {
+        delete m_greeterpriv;
+        QTRY_COMPARE(QThreadPool::globalInstance()->activeThreadCount(), 0);
+    }
+
+    void testRapidFireAuthentication()
+    {
+        m_greeterpriv->authenticationUser = qgetenv("USER");
+        for (int i = 0; i < 100; i++) {
+            m_greeterpriv->handleAuthenticate();
+        }
+    }
+
+private:
+    QLightDM::GreeterPrivate *m_greeterpriv;
+};
+
+QTEST_GUILESS_MAIN(GreeterPamTest)
+
+#include "pam.moc"