Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: disable checks on darwin, for Ventura users #238

Merged
merged 2 commits into from
Jul 31, 2023
Merged

vendor: disable checks on darwin, for Ventura users #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f86028
vendor: disable checks on darwin, for Ventura users
inclyc Jul 31, 2023
2be3381
meson: enable test if lit.found()
inclyc Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation {

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

doCheck = true;
doCheck = !stdenv.isDarwin;

checkPhase = ''
runHook preCheck
Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ boost = dependency('boost')
cpp = meson.get_compiler('cpp')
backtrace = cpp.find_library('backtrace')

lit = find_program('lit')
lit = find_program('lit', required: false)

subdir('lspserver')
subdir('nixd')
4 changes: 3 additions & 1 deletion nixd/tools/nix-ast-dump/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ regression_env = environment()
regression_env.append('PATH', meson.current_build_dir())
regression_env.set('MESON_BUILD_ROOT', meson.current_build_dir())

test('regression/nix-ast-dump', lit, env: regression_env, args: [ '-vv', meson.current_source_dir() + '/test' ], depends: [ nix_ast_dump ] )
if lit.found()
test('regression/nix-ast-dump', lit, env: regression_env, args: [ '-vv', meson.current_source_dir() + '/test' ], depends: [ nix_ast_dump ] )
endif
16 changes: 9 additions & 7 deletions nixd/tools/nixd-ast-dump/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ regression_env = environment()
regression_env.append('PATH', meson.current_build_dir())
regression_env.set('MESON_BUILD_ROOT', meson.current_build_dir())

test('regression/nixd-ast-dump'
, lit
, timeout: 120
, env: regression_env
, args: [ '-vv', meson.current_source_dir() + '/test' ]
, depends: [ nixd_ast_dump ]
)
if lit.found()
test('regression/nixd-ast-dump'
, lit
, timeout: 120
, env: regression_env
, args: [ '-vv', meson.current_source_dir() + '/test' ]
, depends: [ nixd_ast_dump ]
)
endif
4 changes: 3 additions & 1 deletion nixd/tools/nixd/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ regression_env = environment()
regression_env.append('PATH', meson.current_build_dir())
regression_env.set('MESON_BUILD_ROOT', meson.current_build_dir())

test('regression/nixd', lit, env: regression_env, args: [ '-vv', meson.current_source_dir() + '/test' ], depends: [ nixd ] )
if lit.found()
test('regression/nixd', lit, env: regression_env, args: [ '-vv', meson.current_source_dir() + '/test' ], depends: [ nixd ] )
endif