mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-02 07:23:41 +02:00
tests: fix some Windows testsuite failures
Add test dependencies on the 2 spawn helpers required on Windows.
This commit is contained in:
committed by
Philip Withnall
parent
22d699943d
commit
caf7f8ef49
@@ -840,7 +840,7 @@ if not meson.is_cross_build()
|
||||
|
||||
test_gresource = custom_target('test.gresource',
|
||||
input : 'test.gresource.xml',
|
||||
depends : test_generated_txt,
|
||||
depends : [test_generated_txt, gspawn_helpers],
|
||||
output : 'test.gresource',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -855,6 +855,7 @@ if not meson.is_cross_build()
|
||||
|
||||
test_resources2_c = custom_target('test_resources2.c',
|
||||
input : 'test3.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'test_resources2.c',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -868,6 +869,7 @@ if not meson.is_cross_build()
|
||||
|
||||
test_resources2_h = custom_target('test_resources2.h',
|
||||
input : 'test3.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'test_resources2.h',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -881,7 +883,7 @@ if not meson.is_cross_build()
|
||||
|
||||
test_resources_c = custom_target('test_resources.c',
|
||||
input : 'test2.gresource.xml',
|
||||
depends : big_test_resource,
|
||||
depends : [big_test_resource, gspawn_helpers],
|
||||
output : 'test_resources.c',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -895,6 +897,7 @@ if not meson.is_cross_build()
|
||||
|
||||
digit_test_resources_c = custom_target('digit_test_resources.c',
|
||||
input : '111_digit_test.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'digit_test_resources.c',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -908,6 +911,7 @@ if not meson.is_cross_build()
|
||||
|
||||
digit_test_resources_h = custom_target('digit_test_resources.h',
|
||||
input : '111_digit_test.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'digit_test_resources.h',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -960,6 +964,7 @@ if not meson.is_cross_build()
|
||||
|
||||
test_gresource_binary = custom_target('test5.gresource',
|
||||
input : 'test5.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'test5.gresource',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -975,6 +980,7 @@ if not meson.is_cross_build()
|
||||
# Create resource data file
|
||||
test_resources_binary_c = custom_target('test_resources_binary.c',
|
||||
input : 'test5.gresource.xml',
|
||||
depends : [gspawn_helpers],
|
||||
output : 'test_resources_binary.c',
|
||||
command : [glib_compile_resources,
|
||||
compiler_type,
|
||||
@@ -1090,7 +1096,7 @@ foreach test_name, extra_args : gio_tests
|
||||
suite = ['gio'] + extra_args.get('suite', [])
|
||||
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
|
||||
local_test_env = test_env
|
||||
depends = [extra_args.get('depends', [])]
|
||||
depends = [extra_args.get('depends', []), gspawn_helpers]
|
||||
|
||||
foreach program : extra_args.get('extra_programs', [])
|
||||
depends += test_extra_programs_targets[program]
|
||||
|
Reference in New Issue
Block a user