luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-31 22:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cross-installed-tests' into 'master'

Browse Source 
Always build tests if we enabled installed-tests

See merge request GNOME/glib!1138
This commit is contained in:
Philip Withnall
2019-10-02 15:54:19 +00:00
parent 406c8b04fc 42d8e17795
commit 0c40f3f6b9
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/meson.build
View File

@@ -1009,8 +1009,6 @@ if enable_systemtap
endif endif
subdir('fam') subdir('fam')
# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif

2
glib/meson.build
View File

@@ -458,8 +458,6 @@ if enable_systemtap
) )
endif endif
# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif

2
gobject/meson.build
View File

@@ -165,8 +165,6 @@ if enable_systemtap
) )
endif endif
# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif

5
meson.build
View File

@@ -76,6 +76,9 @@ installed_tests_enabled = get_option('installed_tests')
installed_tests_template = files('template.test.in') installed_tests_template = files('template.test.in')
installed_tests_template_tap = files('template-tap.test.in') installed_tests_template_tap = files('template-tap.test.in')
# Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled
add_project_arguments('-D_GNU_SOURCE', language: 'c') add_project_arguments('-D_GNU_SOURCE', language: 'c')
# Disable strict aliasing; # Disable strict aliasing;
@@ -2097,8 +2100,6 @@ subdir('gthread')
subdir('gmodule') subdir('gmodule')
subdir('gio') subdir('gio')
subdir('fuzzing') subdir('fuzzing')
# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif