[folks/wip/nielsdg/only-disable-faulty-tests] CI: re-enable the tests; only disable the 2 faulty

[Niels De Graef <nielsdg src gnome org>]

commit e77b3622b2874907770be61b8434e0f88751a545
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed Dec 12 21:52:19 2018 +0100

    CI: re-enable the tests; only disable the 2 faulty
    
    This is to make sure we have at least some CI on our repo, while we have
    https://gitlab.gnome.org/GNOME/folks/issues/3 to track the faulty tests.

 .gitlab-ci.yml          | 4 +---
 tests/folks/Makefile.am | 8 ++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2399336..82148144 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,7 @@ fedora-latest:
     # Build
     - make
     # Run tests
-    # FIXME: Tests temporarily disabled because they don’t pass on CI
-    # See https://gitlab.gnome.org/GNOME/folks/issues/3
-    - make check || true
+    - make check
   artifacts:
     name: "folks-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index 1b3855e2..afa57d99 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -43,6 +43,8 @@ LDADD = \
        $(NULL)
 
 # in order from least to most complex
+# FIXME: Tests temporarily disabled because they don’t pass on CI
+# See https://gitlab.gnome.org/GNOME/folks/issues/3
 all_test_programs = \
        small-set \
        abstract-field-details \
@@ -50,13 +52,15 @@ all_test_programs = \
        utils \
        primary-store-changes \
        backend-loading \
-       aggregation \
+       # TODO: enable again
+       # aggregation \
        standalone-individuals \
        avatar-cache \
        object-cache \
        phone-field-details \
        name-details \
-       init \
+       # TODO enable again
+       # init \
        $(NULL)
 installed_tests_subdirectory = folks