Merge branch 'develop'

liri-archive · Apr 29, 2018 · 80b0e78 · 80b0e78
2 parents 4c45147 + c576094
commit 80b0e78
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -34,5 +34,6 @@ qbs -d build -j $(nproc) --all-products profile:travis-qt5 \
     modules.lirideployment.prefix:/usr \
     modules.lirideployment.libDir:/usr/lib/x86_64-linux-gnu \
     modules.lirideployment.qmlDir:/usr/lib/x86_64-linux-gnu/qt5/qml \
-    modules.lirideployment.pluginsDir:/usr/lib/x86_64-linux-gnu/qt5/plugins
+    modules.lirideployment.pluginsDir:/usr/lib/x86_64-linux-gnu/qt5/plugins \
+    project.autotestEnabled:false
 travis_end "build"
diff --git a/src/udev/udev.qbs b/src/udev/udev.qbs
@@ -35,7 +35,7 @@ LiriModuleProject {
     LiriModule {
         name: root.moduleName
         targetName: root.targetName
-        version: "0.0.0"
+        version: "1.0.0"
 
         Depends { name: root.headersName }
         Depends {

diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
@@ -18,6 +18,17 @@ Project {
         environment: {
             var env = base;
             env.push("LD_LIBRARY_PATH=" + FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, lirideployment.libDir));
+
+            var found = false;
+            for (var i in env) {
+                if (env[i].startsWith("XDG_RUNTIME_DIR=")) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found)
+                env.push("XDG_RUNTIME_DIR=/tmp");
+
             return env;
         }
     }

diff --git a/tests/auto/udev/tst_udev.cpp b/tests/auto/udev/tst_udev.cpp
@@ -56,6 +56,8 @@ private Q_SLOTS:
         if (error)
             QFAIL(error->message);
         umockdev_testbed_enable(m_bed);
+
+        QVERIFY(umockdev_in_mock_environment());
     }
 
     void cleanupTestCase()