Skip to content

Fix test failures on Darwin on a case-sensitive fs #11820

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

Merged
eli-schwartz merged 1 commit into from
May 28, 2023
Merged

Fix test failures on Darwin on a case-sensitive fs #11820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 test cases/failing/78 framework dependency with version/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ if host_machine.system() != 'darwin'
endif

# do individual frameworks have a meaningful version to test? And multiple frameworks might be listed...
dep = dependency('appleframeworks', modules: 'foundation', version: '>0')
dep = dependency('appleframeworks', modules: 'Foundation', version: '>0')
2 changes: 1 addition & 1 deletion test cases/objc/2 nsstring/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('nsstring', 'objc')

if host_machine.system() == 'darwin'
dep = dependency('appleframeworks', modules : 'foundation')
dep = dependency('appleframeworks', modules : 'Foundation')
elif host_machine.system() == 'cygwin'
error('MESON_SKIP_TEST GNUstep is not packaged for Cygwin.')
else
Expand Down
2 changes: 1 addition & 1 deletion test cases/osx/6 multiframework/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project('multiframework', 'objc')
# that causes a build failure when defining two modules. The
# arguments for the latter module overwrote the arguments for
# the first one rather than adding to them.
cocoa_dep = dependency('appleframeworks', modules : ['AppKit', 'foundation'])
cocoa_dep = dependency('appleframeworks', modules : ['AppKit', 'Foundation'])

executable('deptester',
'main.m',
Expand Down