[tracker: 3/3] Merge branch 'wip/carlosg/optional-tap' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit ca0c150fe7b6e80416d1122fa5c445362b6da718
Merge: f26f8eb10 597319758
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Mar 22 12:55:50 2021 +0000

    Merge branch 'wip/carlosg/optional-tap' into 'master'
    
    Make TAP protocol in tests optional
    
    See merge request GNOME/tracker!385

 .gitlab-ci.yml                               |  7 +------
 meson_options.txt                            |  2 ++
 tests/functional-tests/configuration.json.in |  1 +
 tests/functional-tests/configuration.py      |  4 ++++
 tests/functional-tests/fixtures.py           | 14 ++++++++------
 tests/functional-tests/meson.build           |  9 ++++++++-
 tests/meson.build                            |  8 +++++++-
 7 files changed, 31 insertions(+), 14 deletions(-)
---