[glib: 11/13] tools: Move glib.supp to tools directory

[Philip Withnall <pwithnall src gnome org>]

commit 512975088403f47585cd93bdc79c9dc5a868b7f6
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed May 11 13:11:01 2022 +0100

    tools: Move glib.supp to tools directory
    
    This tidies up the root directory a bit more.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 .gitlab-ci.yml               | 2 +-
 meson.build                  | 7 -------
 glib.supp => tools/glib.supp | 0
 tools/meson.build            | 7 +++++++
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8488d2b8ef..0f068441dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,7 +226,7 @@ valgrind:
     - ninja -C _build
     - bash -x ./.gitlab-ci/run-tests.sh
                  --log-file _build/meson-logs/testlog-valgrind.json
-                 --wrap "valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes --leak-check=full 
--leak-resolution=high --num-callers=50 --show-leak-kinds=definite,possible --show-error-list=yes 
--suppressions=${CI_PROJECT_DIR}/glib.supp"
+                 --wrap "valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes --leak-check=full 
--leak-resolution=high --num-callers=50 --show-leak-kinds=definite,possible --show-error-list=yes 
--suppressions=${CI_PROJECT_DIR}/tools/glib.supp"
                  --no-suite no-valgrind
                  --no-suite slow
   # FIXME: Remove this when we have zero valgrind leaks.
diff --git a/meson.build b/meson.build
index 3a5276e9ff..6e796b39ba 100644
--- a/meson.build
+++ b/meson.build
@@ -2388,13 +2388,6 @@ endif
 install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4',
   install_dir : join_paths(get_option('datadir'), 'aclocal'))
 
-if host_system != 'windows'
-  # Install Valgrind suppression file (except on Windows,
-  # as Valgrind is currently not supported on Windows)
-  install_data('glib.supp',
-    install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind'))
-endif
-
 configure_file(output : 'config.h', configuration : glib_conf)
 
 if host_system == 'windows'
diff --git a/glib.supp b/tools/glib.supp
similarity index 100%
rename from glib.supp
rename to tools/glib.supp
diff --git a/tools/meson.build b/tools/meson.build
index f77ccc860d..d550a0e372 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -12,3 +12,10 @@ if have_sh
     output : 'glib-gettextize',
     configuration : gettextize_conf)
 endif
+
+if host_system != 'windows'
+  # Install Valgrind suppression file (except on Windows,
+  # as Valgrind is currently not supported on Windows)
+  install_data('glib.supp',
+    install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind'))
+endif