mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 10:08:56 +01:00 
			
		
		
		
	tests: Stop ignoring test failures on macOS
Test failures were previously ignored on macOS because there are 12 tests which consistently fail (and have not yet been fixed, because there are no regularly active macOS maintainers for GLib; you could help here!). However, this means that new test failures can’t be spotted. So, explicitly mark those 12 tests as `should_fail` on macOS, and then make other test failures cause failure of the CI run. We can track the process of fixing those 12 tests on #1392 and #1251. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Helps: #1392
This commit is contained in:
		@@ -449,8 +449,7 @@ macos:
 | 
				
			|||||||
            --werror
 | 
					            --werror
 | 
				
			||||||
            _build
 | 
					            _build
 | 
				
			||||||
    - ninja -C _build
 | 
					    - ninja -C _build
 | 
				
			||||||
    # FIXME: Multiple unit tests currently fails
 | 
					    - .gitlab-ci/run-tests.sh
 | 
				
			||||||
    - .gitlab-ci/run-tests.sh || true
 | 
					 | 
				
			||||||
  artifacts:
 | 
					  artifacts:
 | 
				
			||||||
    reports:
 | 
					    reports:
 | 
				
			||||||
      junit: "_build/${CI_JOB_NAME}-report.xml"
 | 
					      junit: "_build/${CI_JOB_NAME}-report.xml"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,14 +42,20 @@ giotypefuncs_inc = custom_target(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#  Test programs buildable on all platforms
 | 
					#  Test programs buildable on all platforms
 | 
				
			||||||
gio_tests = {
 | 
					gio_tests = {
 | 
				
			||||||
  'appmonitor' : {},
 | 
					  'appmonitor' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'async-close-output-stream' : {},
 | 
					  'async-close-output-stream' : {},
 | 
				
			||||||
  'async-splice-output-stream' : {},
 | 
					  'async-splice-output-stream' : {},
 | 
				
			||||||
  'buffered-input-stream' : {},
 | 
					  'buffered-input-stream' : {},
 | 
				
			||||||
  'buffered-output-stream' : {},
 | 
					  'buffered-output-stream' : {},
 | 
				
			||||||
  'cancellable' : {},
 | 
					  'cancellable' : {},
 | 
				
			||||||
  'contexts' : {},
 | 
					  'contexts' : {},
 | 
				
			||||||
  'contenttype' : {},
 | 
					  'contenttype' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'converter-stream' : {},
 | 
					  'converter-stream' : {},
 | 
				
			||||||
  'credentials' : {},
 | 
					  'credentials' : {},
 | 
				
			||||||
  'cxx' : {
 | 
					  'cxx' : {
 | 
				
			||||||
@@ -59,10 +65,19 @@ gio_tests = {
 | 
				
			|||||||
  'data-output-stream' : {},
 | 
					  'data-output-stream' : {},
 | 
				
			||||||
  'fileattributematcher' : {},
 | 
					  'fileattributematcher' : {},
 | 
				
			||||||
  'filter-streams' : {},
 | 
					  'filter-streams' : {},
 | 
				
			||||||
  'giomodule' : {},
 | 
					  'giomodule' : {
 | 
				
			||||||
  'gsubprocess' : {},
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  'gsubprocess' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'g-file' : {},
 | 
					  'g-file' : {},
 | 
				
			||||||
  'g-file-info' : {},
 | 
					  'g-file-info' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'g-icon' : {},
 | 
					  'g-icon' : {},
 | 
				
			||||||
  'gdbus-addresses' : {},
 | 
					  'gdbus-addresses' : {},
 | 
				
			||||||
  'gdbus-message' : {},
 | 
					  'gdbus-message' : {},
 | 
				
			||||||
@@ -72,7 +87,11 @@ gio_tests = {
 | 
				
			|||||||
  'memory-monitor' : {},
 | 
					  'memory-monitor' : {},
 | 
				
			||||||
  'memory-output-stream' : {},
 | 
					  'memory-output-stream' : {},
 | 
				
			||||||
  'mount-operation' : {},
 | 
					  'mount-operation' : {},
 | 
				
			||||||
  'network-address' : {'extra_sources': ['mock-resolver.c']},
 | 
					  'network-address' : {
 | 
				
			||||||
 | 
					    'extra_sources': ['mock-resolver.c'],
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'network-monitor' : {},
 | 
					  'network-monitor' : {},
 | 
				
			||||||
  'network-monitor-race' : {},
 | 
					  'network-monitor-race' : {},
 | 
				
			||||||
  'permission' : {},
 | 
					  'permission' : {},
 | 
				
			||||||
@@ -83,7 +102,10 @@ gio_tests = {
 | 
				
			|||||||
  'simple-async-result' : {},
 | 
					  'simple-async-result' : {},
 | 
				
			||||||
  'simple-proxy' : {},
 | 
					  'simple-proxy' : {},
 | 
				
			||||||
  'sleepy-stream' : {},
 | 
					  'sleepy-stream' : {},
 | 
				
			||||||
  'socket' : {},
 | 
					  'socket' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'socket-listener' : {},
 | 
					  'socket-listener' : {},
 | 
				
			||||||
  'socket-service' : {},
 | 
					  'socket-service' : {},
 | 
				
			||||||
  'srvtarget' : {},
 | 
					  'srvtarget' : {},
 | 
				
			||||||
@@ -97,7 +119,10 @@ gio_tests = {
 | 
				
			|||||||
  'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
					  'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
				
			||||||
  'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
					  'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
				
			||||||
  'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
					  'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
 | 
				
			||||||
  'gdbus-address-get-session' : {},
 | 
					  'gdbus-address-get-session' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'win32-appinfo' : {},
 | 
					  'win32-appinfo' : {},
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -156,7 +181,9 @@ if host_machine.system() != 'windows'
 | 
				
			|||||||
    'file' : {},
 | 
					    'file' : {},
 | 
				
			||||||
    'gdbus-peer' : {
 | 
					    'gdbus-peer' : {
 | 
				
			||||||
      'dependencies' : [libgdbus_example_objectmanager_dep],
 | 
					      'dependencies' : [libgdbus_example_objectmanager_dep],
 | 
				
			||||||
      'install_rpath' : installed_tests_execdir
 | 
					      'install_rpath' : installed_tests_execdir,
 | 
				
			||||||
 | 
					      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					      'should_fail' : host_system == 'darwin',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    'gdbus-peer-object-manager' : {},
 | 
					    'gdbus-peer-object-manager' : {},
 | 
				
			||||||
    'live-g-file' : {},
 | 
					    'live-g-file' : {},
 | 
				
			||||||
@@ -779,6 +806,8 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
 | 
				
			|||||||
  gio_tests += {
 | 
					  gio_tests += {
 | 
				
			||||||
    'resources' : {
 | 
					    'resources' : {
 | 
				
			||||||
      'extra_sources' : resources_extra_sources,
 | 
					      'extra_sources' : resources_extra_sources,
 | 
				
			||||||
 | 
					      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					      'should_fail' : host_system == 'darwin',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
@@ -832,6 +861,7 @@ foreach test_name, extra_args : gio_tests
 | 
				
			|||||||
    suite : suite,
 | 
					    suite : suite,
 | 
				
			||||||
    is_parallel : extra_args.get('is_parallel', true),
 | 
					    is_parallel : extra_args.get('is_parallel', true),
 | 
				
			||||||
    depends : extra_args.get('depends', []),
 | 
					    depends : extra_args.get('depends', []),
 | 
				
			||||||
 | 
					    should_fail : extra_args.get('should_fail', false),
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,9 +19,15 @@ glib_tests = {
 | 
				
			|||||||
    'source' : ['cxx.cpp'],
 | 
					    'source' : ['cxx.cpp'],
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  'dataset' : {},
 | 
					  'dataset' : {},
 | 
				
			||||||
  'date' : {},
 | 
					  'date' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'dir' : {},
 | 
					  'dir' : {},
 | 
				
			||||||
  'environment' : {},
 | 
					  'environment' : {
 | 
				
			||||||
 | 
					    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
 | 
				
			||||||
 | 
					    'should_fail' : host_system == 'darwin',
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  'error' : {},
 | 
					  'error' : {},
 | 
				
			||||||
  'fileutils' : {},
 | 
					  'fileutils' : {},
 | 
				
			||||||
  'gdatetime' : {
 | 
					  'gdatetime' : {
 | 
				
			||||||
@@ -241,7 +247,12 @@ foreach test_name, extra_args : glib_tests
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  suite = ['glib'] + extra_args.get('suite', [])
 | 
					  suite = ['glib'] + extra_args.get('suite', [])
 | 
				
			||||||
  timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
 | 
					  timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
 | 
				
			||||||
  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 | 
					  test(test_name, exe,
 | 
				
			||||||
 | 
					    env : test_env,
 | 
				
			||||||
 | 
					    timeout : timeout,
 | 
				
			||||||
 | 
					    suite : suite,
 | 
				
			||||||
 | 
					    should_fail : extra_args.get('should_fail', false),
 | 
				
			||||||
 | 
					  )
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
executable('spawn-path-search-helper', 'spawn-path-search-helper.c',
 | 
					executable('spawn-path-search-helper', 'spawn-path-search-helper.c',
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user