From ea8e6502d4d4a56ed05c47812546e71f8e4909fb Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 3 Apr 2019 16:45:58 +0100 Subject: [PATCH] build: Refactor resources test build instructions This introduces no functional changes, but combines two duplicated lists and makes the meson.build file a little easier to follow. Signed-off-by: Philip Withnall Helps: #1711 --- gio/tests/meson.build | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 00e32c341..29221013e 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -557,6 +557,15 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() copy : true, install : false) + resources_extra_sources = [ + test_gresource, + test_resources_c, + test_resources2_c, + test_resources2_h, + digit_test_resources_c, + digit_test_resources_h, + ] + # Create object file containing resource data # for testing the external data option if build_machine.system() == 'linux' @@ -603,21 +612,17 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() '@INPUT@', '@OUTPUT@']) - gio_tests += { - 'resources' : { - 'extra_sources' : [test_gresource, test_resources_c, test_resources2_c, - test_resources2_h, test_resources_binary_c, - test_resources_binary2, digit_test_resources_c, digit_test_resources_h], - }, - } - else - gio_tests += { - 'resources' : { - 'extra_sources' : [test_gresource, test_resources_c, test_resources2_c, - test_resources2_h, digit_test_resources_c, digit_test_resources_h], - }, - } + resources_extra_sources += [ + test_resources_binary_c, + test_resources_binary2, + ] endif + + gio_tests += { + 'resources' : { + 'extra_sources' : resources_extra_sources, + }, + } endif foreach test_name, extra_args : gio_tests