Merge lp:~mhr3/unity-scopes-shell/scopes-list-delay-envvar into lp:unity-scopes-shell

[Michal Hruby]

Added environment variable that controls the scope thread delay.

Added environment variable that controls the scope thread delay.

This allows us to set the delay to a huge value when running qmlplugindump, which fixes a crash that can happen in it. It also allows us to lower the delay when running tests, so they run faster.

[Nick Dedekind (nick-dedekind)]

Looks horrible, but it'll do!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'cmake/modules/Plugins.cmake'
--- cmake/modules/Plugins.cmake	2013-11-18 17:58:14 +0000
+++ cmake/modules/Plugins.cmake	2013-12-20 16:53:57 +0000
@@ -50,7 +50,7 @@
     if(NOT CMAKE_CROSSCOMPILING)
         # create the plugin.qmltypes file
         add_custom_target(${PLUGIN}-qmltypes ALL
-            COMMAND ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_CURRENT_BINARY_DIR}/../ > ${CMAKE_CURRENT_BINARY_DIR}/plugin.qmltypes
+            COMMAND UNITY_SCOPES_LIST_DELAY=10000 ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_CURRENT_BINARY_DIR}/../ > ${CMAKE_CURRENT_BINARY_DIR}/plugin.qmltypes
         )
         add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})
 

=== modified file 'src/Unity/scopes-ng/scopes.cpp'
--- src/Unity/scopes-ng/scopes.cpp	2013-12-12 12:53:36 +0000
+++ src/Unity/scopes-ng/scopes.cpp	2013-12-20 16:53:57 +0000
@@ -68,6 +68,8 @@
     return m_metadataMap;
 }
 
+int Scopes::LIST_DELAY = -1;
+
 Scopes::Scopes(QObject *parent)
     : QAbstractListModel(parent)
     , m_listThread(nullptr)
@@ -80,7 +82,11 @@
 
     // delaying spawning the worker thread, causes problems with qmlplugindump
     // without it
-    QTimer::singleShot(100, this, SLOT(populateScopes()));
+    if (LIST_DELAY < 0) {
+        QByteArray listDelay = qgetenv("UNITY_SCOPES_LIST_DELAY");
+        LIST_DELAY = listDelay.isNull() ? 100 : listDelay.toInt();
+    }
+    QTimer::singleShot(LIST_DELAY, this, SLOT(populateScopes()));
 }
 
 Scopes::~Scopes()

=== modified file 'src/Unity/scopes-ng/scopes.h'
--- src/Unity/scopes-ng/scopes.h	2013-12-10 16:46:46 +0000
+++ src/Unity/scopes-ng/scopes.h	2013-12-20 16:53:57 +0000
@@ -72,6 +72,8 @@
     void discoveryFinished();
 
 private:
+    static int LIST_DELAY;
+
     QHash<int, QByteArray> m_roles;
     QList<Scope*> m_scopes;
     QThread* m_listThread;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-12-18 10:25:51 +0000
+++ tests/CMakeLists.txt	2013-12-20 16:53:57 +0000
@@ -35,7 +35,7 @@
         add_executable(${_test}Exec ${_test}.cpp)
         qt5_use_modules(${_test}Exec Test Core Qml)
         set_tests_properties(test${CLASSNAME}${_test}
-                PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Unity:${LIBUNITYPROTO_LIBRARY_DIRS};UNITY_SCOPES_RUNTIME_PATH=${SCOPES_TEST_RUNTIME}")
+                PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Unity:${LIBUNITYPROTO_LIBRARY_DIRS};UNITY_SCOPES_RUNTIME_PATH=${SCOPES_TEST_RUNTIME};UNITY_SCOPES_LIST_DELAY=5")
         set_target_properties(${_test}Exec
                 PROPERTIES COMPILE_FLAGS "-DTEST_SCOPEREGISTRY_BIN='\"${SCOPES_BIN_DIR}/scoperegistry/scoperegistry\"' -DTEST_RUNTIME_CONFIG='\"${SCOPES_TEST_RUNTIME}\"'")