mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 01:58:54 +01:00 
			
		
		
		
	tests: Improve build of cmph tests in girepository
They were still failing with `-Dglib_assert=false` because `G_DISABLE_ASSERT` wasn’t being explicitly un-defined for the test. See https://gitlab.gnome.org/GNOME/glib/-/jobs/3309889 Also while we’re there, take the opportunity to correctly set the test suite, protocol and environment. Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
		@@ -65,13 +65,22 @@ if cc.get_id() != 'msvc'
 | 
			
		||||
  ])
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
test_env = environment()
 | 
			
		||||
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 | 
			
		||||
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 | 
			
		||||
 | 
			
		||||
cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c',
 | 
			
		||||
  dependencies: [
 | 
			
		||||
    cmph_dep,
 | 
			
		||||
    libglib_dep,
 | 
			
		||||
    libgobject_dep,
 | 
			
		||||
  ],
 | 
			
		||||
  c_args: custom_c_args,
 | 
			
		||||
  c_args: custom_c_args + ['-UG_DISABLE_ASSERT'],
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
test('cmph-bdz-test', cmph_test)
 | 
			
		||||
test('cmph-bdz-test', cmph_test,
 | 
			
		||||
  env: test_env,
 | 
			
		||||
  protocol: test_protocol,
 | 
			
		||||
  suite: ['girepository'],
 | 
			
		||||
  timeout: test_timeout,
 | 
			
		||||
)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user