[nautilus/wip/oholy/drop-meson-args] flatpak: Build all tests by default

[Ondrej Holy <oholy src gnome org>]

commit d521a0334e6f92c9d559f45b04aec30ff851db92
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Apr 24 11:02:49 2020 +0200

    flatpak: Build all tests by default
    
    The flatpak template has been changed recently and MESON_ARGS variable
    doesn't have any effect currently. Let's drop MESON_ARGS and move the
    build options into the manifests directly (ie. -Dtests=all).
    
    See:
    https://gitlab.gnome.org/GNOME/citemplates/blob/master/flatpak/flatpak_ci_initiative.yml
    https://mail.gnome.org/archives/desktop-devel-list/2020-April/thread.html

 .gitlab-ci.yml                                 | 2 --
 build-aux/flatpak/org.gnome.Nautilus.json      | 3 ++-
 build-aux/flatpak/org.gnome.Nautilus.yml       | 1 +
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 804f68fab..24a397f64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ flatpak devel:
     image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus.yml"
-        MESON_ARGS: "-Dprofile=Devel -Dtests=all"
         FLATPAK_MODULE: "nautilus"
         RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo";
         APP_ID: "org.gnome.NautilusDevel"
@@ -43,7 +42,6 @@ flatpak master:
     dependencies: []
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.NautilusMaster.yml"
-        MESON_ARGS: "-Dprofile=Devel -Dtests=all"
         FLATPAK_MODULE: "nautilus"
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
         APP_ID: "org.gnome.NautilusDevel"
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 0f76009a7..ca95c384a 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -158,7 +158,8 @@
       "name": "nautilus",
       "config-opts": [
         "--libdir=/app/lib",
-        "-Dprofile=Devel"
+        "-Dprofile=Devel",
+        "-Dtests=all"
       ],
       "sources": [
         {
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index bd3a1e2ff..f22736fa6 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -116,6 +116,7 @@ modules:
   config-opts:
   - "--libdir=/app/lib"
   - "-Dprofile=Devel"
+  - "-Dtests=all"
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/nautilus.git
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 3e7ddd1d0..10608aafd 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -115,6 +115,7 @@ modules:
   config-opts:
   - "--libdir=/app/lib"
   - "-Dprofile=Devel"
+  - "-Dtests=all"
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/nautilus.git