[geary/geary-0.13] Merge branch 'wip/workaround-gcc150-b0rkedness' into 'master'

[Michael Gratton <mjog src gnome org>]

commit e741b93422cff2a0f0872ad37ab9f8ecf87658d4
Author: Michael Gratton <mike vee net>
Date:   Tue Feb 19 06:30:26 2019 +0000

    Merge branch 'wip/workaround-gcc150-b0rkedness' into 'master'
    
    Work around DB tests always failing on gcc150.osuosl.org CI runner
    
    See merge request GNOME/geary!114
    
    (cherry picked from commit 087a0888094a453bb0c47e2f1d0b347cb66842b5)
    
    b3b44ccd Work around DB tests always failing on gcc150.osuosl.org CI runner

 test/test-engine.vala | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/test/test-engine.vala b/test/test-engine.vala
index 6a9a17a2..cb8cd237 100644
--- a/test/test-engine.vala
+++ b/test/test-engine.vala
@@ -22,6 +22,12 @@ int main(string[] args) {
 
     TestSuite engine = new TestSuite("engine");
 
+    // 😢 https://gitlab.gnome.org/Infrastructure/Infrastructure/issues/97
+    bool disable_db_tests = (
+        GLib.Environment.get_variable("CI_RUNNER_DESCRIPTION") ==
+        "gcc150.osuosl.org"
+    );
+
     engine.add_suite(new Geary.AccountInformationTest().get_suite());
     engine.add_suite(new Geary.AttachmentTest().get_suite());
     engine.add_suite(new Geary.EngineTest().get_suite());
@@ -35,8 +41,10 @@ int main(string[] args) {
     engine.add_suite(new Geary.App.ConversationMonitorTest().get_suite());
     engine.add_suite(new Geary.Ascii.Test().get_suite());
     engine.add_suite(new Geary.ConfigFileTest().get_suite());
-    engine.add_suite(new Geary.Db.DatabaseTest().get_suite());
-    engine.add_suite(new Geary.Db.VersionedDatabaseTest().get_suite());
+    if (!disable_db_tests) {
+        engine.add_suite(new Geary.Db.DatabaseTest().get_suite());
+        engine.add_suite(new Geary.Db.VersionedDatabaseTest().get_suite());
+    }
     engine.add_suite(new Geary.HTML.UtilTest().get_suite());
     // Other IMAP tests rely on DataFormat working, so test that first
     engine.add_suite(new Geary.Imap.DataFormatTest().get_suite());
@@ -46,11 +54,13 @@ int main(string[] args) {
     engine.add_suite(new Geary.Imap.ListParameterTest().get_suite());
     engine.add_suite(new Geary.Imap.MailboxSpecifierTest().get_suite());
     engine.add_suite(new Geary.Imap.NamespaceResponseTest().get_suite());
-    engine.add_suite(new Geary.ImapDB.AccountTest().get_suite());
-    engine.add_suite(new Geary.ImapDB.AttachmentTest().get_suite());
-    engine.add_suite(new Geary.ImapDB.AttachmentIoTest().get_suite());
-    engine.add_suite(new Geary.ImapDB.DatabaseTest().get_suite());
-    engine.add_suite(new Geary.ImapDB.FolderTest().get_suite());
+    if (!disable_db_tests) {
+        engine.add_suite(new Geary.ImapDB.AccountTest().get_suite());
+        engine.add_suite(new Geary.ImapDB.AttachmentTest().get_suite());
+        engine.add_suite(new Geary.ImapDB.AttachmentIoTest().get_suite());
+        engine.add_suite(new Geary.ImapDB.DatabaseTest().get_suite());
+        engine.add_suite(new Geary.ImapDB.FolderTest().get_suite());
+    }
     engine.add_suite(new Geary.ImapEngine.AccountProcessorTest().get_suite());
     engine.add_suite(new Geary.Inet.Test().get_suite());
     engine.add_suite(new Geary.JS.Test().get_suite());