[dia/bilelmoussaoui/disable-tests] Disable tests



commit 8acf25fd250be25819cf13f642a7bf32bb423409
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Wed May 22 18:10:03 2019 +0200

    Disable tests
    
    Currently tests are failing, disable them by default. We can renable them as part of the gitlab CI later.

 .gitlab-ci.yml    | 1 +
 meson.build       | 4 +++-
 meson_options.txt | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 123f07c6..6a7b892c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ flatpak:
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Dia.json"
         FLATPAK_MODULE: "dia"
+        MESON_ARGS: "-Dtests=false"
         RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
         APP_ID: "org.gnome.Dia"
     extends: .flatpak
diff --git a/meson.build b/meson.build
index 601a812c..4a18c33b 100644
--- a/meson.build
+++ b/meson.build
@@ -86,7 +86,9 @@ subdir('doc')
 subdir('plug-ins')
 subdir('sheets')
 subdir('shapes')
-subdir('tests')
+if get_option('tests')
+    subdir('tests')
+endif
 subdir('docs')
 
 # TODO: idealy this should use run_env from tests/
diff --git a/meson_options.txt b/meson_options.txt
index b838b99c..9593631c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,6 @@
 option('gtk_doc',
        type: 'boolean', value: false,
-       description: 'Whether to generate the API reference')
\ No newline at end of file
+       description: 'Whether to generate the API reference')
+option('test',
+       type: 'boolean', value: false,
+       description: 'Whether to compile unit tests')
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]