diff options
| -rw-r--r-- | eel/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | test/automated/meson.build | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/eel/meson.build b/eel/meson.build index 3bca16fde..70419c670 100644 --- a/eel/meson.build +++ b/eel/meson.build @@ -56,6 +56,6 @@ check_eel = executable( ] ) -if get_option('display-tests') +if get_option('tests') == 'all' test('check-eel', check_eel) endif diff --git a/meson.build b/meson.build index 340caa042..d505f66ce 100644 --- a/meson.build +++ b/meson.build @@ -121,7 +121,9 @@ subdir('eel') subdir('libnautilus-extension') subdir('src') -subdir('test') +if get_option('tests') != 'none' + subdir('test') +endif subdir('data') subdir('po') if get_option('docs') diff --git a/meson_options.txt b/meson_options.txt index 6a8266777..7b6cc6946 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,4 +3,4 @@ option('profiling', type: 'boolean', value: false) option('extensions', type: 'boolean', value: true) option('packagekit', type: 'boolean', value: true) option('selinux', type: 'boolean', value: false) -option('display-tests', type: 'boolean', value: false) +option('tests', type: 'combo', choices: ['none', 'headless', 'all'], value: 'headless') diff --git a/src/meson.build b/src/meson.build index 9419aa83a..8601de459 100644 --- a/src/meson.build +++ b/src/meson.build @@ -303,7 +303,7 @@ nautilus = executable( install: true ) -if get_option('display-tests') +if get_option('tests') == 'all' test( 'nautilus', nautilus, args: [ diff --git a/test/automated/meson.build b/test/automated/meson.build index f71d0e884..a1122423a 100644 --- a/test/automated/meson.build +++ b/test/automated/meson.build @@ -1,4 +1,4 @@ subdir('displayless') -if get_option('display-tests') +if get_option('tests') == 'all' subdir('display') endif |