mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f146ee2820 into 1f1b1b34d6

Browse source
This commit is contained in:
random human 2018-09-01 09:23:30 +00:00 • committed by GitHub
commit d048296d5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -217,3 +217,13 @@ if (get_option('fish_completions'))
install_data(fish_files, install_dir: fish_install_dir)
endif
if (get_option('interactive-tests'))
# A test to run the just built sway executable, with all the auxilliaries
# in the path.
sway_paths_find_cmd = 'find @0@ -maxdepth 1 -type d -name \'sway*\' -printf \':%p\''.format(meson.current_build_dir())
sway_paths = run_command('sh', '-c', sway_paths_find_cmd).stdout().strip()
current_env = environment()
current_env.append('PATH', sway_paths)
test('sway', sway_exec, env : current_env, is_parallel : false, timeout : 3600)
endif

1
meson_options.txt
View file

@ -4,3 +4,4 @@ option('zsh_completions', type: 'boolean', value: true, description: 'Install zs
option('bash_completions', type: 'boolean', value: true, description: 'Install bash shell completions.')
option('fish_completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications')
option('interactive-tests', type: 'boolean', value: true, description: 'Enable interactive tests')

2
sway/meson.build
View file

@ -177,7 +177,7 @@ if get_option('enable-xwayland')
sway_deps += xcb
endif
executable(
sway_exec = executable(
'sway',
sway_sources,
include_directories: [sway_inc],