glib, gio tests: Apply the same rules to both gcc and clang when appropriate

gio/tests/meson.build

@@ -86,7 +86,7 @@ gio_tests = {
   'g-file-info' : {
     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3070
     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
-    'can_fail' : host_system in ['darwin', 'gnu'] or host_system == 'windows' and cc.get_id() != 'gcc',
+    'can_fail' : host_system in ['darwin', 'gnu'] or host_system == 'windows' and not glib_gnu_cc_compiler,
   },
   'g-icon' : {},
   'gdbus-addresses' : {},
@@ -1047,7 +1047,7 @@ if not meson.is_cross_build()
                                   '-nostdlib', '@INPUT@', '-o','@OUTPUT@'])
 
     # Rename symbol to match the one in the C file
-    if cc.get_id() == 'gcc' and host_system == 'windows'
+    if glib_gnu_cc_compiler and host_system == 'windows'
       underscore = '_'
     else
       underscore = ''

glib/tests/meson.build

@@ -2,7 +2,7 @@ glib_tests = {
   'array-test' : {},
   'asyncqueue' : {},
   'atomic' : {
-    'c_args' : cc.get_id() == 'gcc' ? ['-Wstrict-aliasing=2'] : [],
+    'c_args' : glib_gnu_cc_compiler ? ['-Wstrict-aliasing=2'] : [],
     'c_standards': c_standards.keys(),
   },
   'base64' : {},
@@ -151,13 +151,13 @@ glib_tests = {
   },
   'strfuncs' : {},
   'string' : {
-    'c_args' : cc.get_id() == 'gcc' ? ['-Werror=sign-conversion'] : [],
+    'c_args' : glib_gnu_cc_compiler ? ['-Werror=sign-conversion'] : [],
   },
   'strvbuilder' : {},
   'testing' : {
     'args': [ '--verbose' ],
     'extra_programs' : ['testing-helper'],
-    'c_args' : cc.get_id() == 'gcc' ? ['-Werror=sign-conversion'] : [],
+    'c_args' : glib_gnu_cc_compiler ? ['-Werror=sign-conversion'] : [],
   },
   'testing-nonfatal' : {
     'protocol' : 'exitcode'
@@ -173,7 +173,7 @@ glib_tests = {
   'types' : {},
   'utf8-performance' : {},
   'utf8-pointer' : {
-    'c_args' : cc.get_id() == 'gcc' ? ['-Werror=cast-qual'] : [],
+    'c_args' : glib_gnu_cc_compiler ? ['-Werror=cast-qual'] : [],
   },
   'utf8-validate' : {},
   'utf8-misc' : {},