Commit a42e8c5c authored by Michael Catanzaro's avatar Michael Catanzaro Committed by Michael Catanzaro

Use feature type for meson options

This could break anyone currently using -Dunit_tests=false, but probably
not many people choose that.


(cherry picked from commit f2b8170e)
parent 46785b80
Pipeline #62428 passed with stage
in 4 minutes and 38 seconds
...@@ -11,7 +11,7 @@ flatpak: ...@@ -11,7 +11,7 @@ flatpak:
FLATPAK_MODULE: 'epiphany' FLATPAK_MODULE: 'epiphany'
# Make sure to keep this in sync with the Flatpak manifest, all arguments # Make sure to keep this in sync with the Flatpak manifest, all arguments
# are passed except the config-args because we build it ourselves # 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' APP_ID: 'org.gnome.Epiphany'
review: review:
......
...@@ -5,8 +5,8 @@ option('developer_mode', ...@@ -5,8 +5,8 @@ option('developer_mode',
) )
option('network_tests', option('network_tests',
type: 'boolean', type: 'feature',
value: false, value: 'disabled',
description: 'Enable tests that require network access, if unit_tests are enabled' description: 'Enable tests that require network access, if unit_tests are enabled'
) )
...@@ -17,7 +17,7 @@ option('tech_preview', ...@@ -17,7 +17,7 @@ option('tech_preview',
) )
option('unit_tests', option('unit_tests',
type: 'boolean', type: 'feature',
value: true, value: 'enabled',
description: 'Enable unit tests' description: 'Enable unit tests'
) )
...@@ -5,7 +5,7 @@ envs = [ ...@@ -5,7 +5,7 @@ envs = [
'GSETTINGS_BACKEND=memory', '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.... # FIXME: The tests that need ephy-test-utils are all disabled....
# #
# libephytestutils = static_library('ephytestutils', # libephytestutils = static_library('ephytestutils',
...@@ -169,7 +169,7 @@ if get_option('unit_tests') ...@@ -169,7 +169,7 @@ if get_option('unit_tests')
# env: envs # env: envs
# ) # )
if get_option('network_tests') if get_option('network_tests').enabled()
gsb_service_test = executable('test-ephy-gsb-service', gsb_service_test = executable('test-ephy-gsb-service',
'ephy-gsb-service-test.c', 'ephy-gsb-service-test.c',
dependencies: ephymain_dep 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