Commit f2b8170e authored by Michael Catanzaro's avatar Michael Catanzaro Committed by Jan-Michael Brummer

Use feature type for meson options

This could break anyone currently using -Dunit_tests=false, but probably
not many people choose that.
parent ca58a424
Pipeline #62361 passed with stage
in 2 minutes and 20 seconds
......@@ -11,7 +11,7 @@ flatpak:
FLATPAK_MODULE: 'epiphany'
# Make sure to keep this in sync with the Flatpak manifest, all arguments
# are passed except the config-args because we build it ourselves
MESON_ARGS: '-Dunit_tests=true -Dnetwork_tests=true'
MESON_ARGS: '-Dunit_tests=enabled -Dnetwork_tests=enabled'
APP_ID: 'org.gnome.Epiphany'
review:
......
......@@ -5,8 +5,8 @@ option('developer_mode',
)
option('network_tests',
type: 'boolean',
value: false,
type: 'feature',
value: 'disabled',
description: 'Enable tests that require network access, if unit_tests are enabled'
)
......@@ -17,7 +17,7 @@ option('tech_preview',
)
option('unit_tests',
type: 'boolean',
value: true,
type: 'feature',
value: 'enabled',
description: 'Enable unit tests'
)
......@@ -5,7 +5,7 @@ envs = [
'GSETTINGS_BACKEND=memory',
]
if get_option('unit_tests')
if get_option('unit_tests').enabled()
# FIXME: The tests that need ephy-test-utils are all disabled....
#
# libephytestutils = static_library('ephytestutils',
......@@ -169,7 +169,7 @@ if get_option('unit_tests')
# env: envs
# )
if get_option('network_tests')
if get_option('network_tests').enabled()
gsb_service_test = executable('test-ephy-gsb-service',
'ephy-gsb-service-test.c',
dependencies: ephymain_dep
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment