diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-05-26 00:10:45 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-05-28 01:51:59 -0400 |
| commit | f71ca2825c6be5aa23583831691687a5e2a88d73 (patch) | |
| tree | 90630f7fd91f0ba50a937a3b7c2dd132d1236718 | |
| parent | 5689ecffa354be8e18ea2cd747709a277070fe18 (diff) | |
| download | meson-f71ca2825c6be5aa23583831691687a5e2a88d73.zip meson-f71ca2825c6be5aa23583831691687a5e2a88d73.tar.gz meson-f71ca2825c6be5aa23583831691687a5e2a88d73.tar.bz2 | |
Fix test failures on Darwin on a case-sensitive fs
This issue was encounetered while working on a contribution to nixpkgs.
Nix allows the store to be installed on a separate, case-sensitive APFS
volume. When the store is on a case-sensitive volume, these tests fail
because they try to use `foundation` instead of `Foundation`.
| -rw-r--r-- | test cases/failing/78 framework dependency with version/meson.build | 2 | ||||
| -rw-r--r-- | test cases/objc/2 nsstring/meson.build | 2 | ||||
| -rw-r--r-- | test cases/osx/6 multiframework/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test cases/failing/78 framework dependency with version/meson.build b/test cases/failing/78 framework dependency with version/meson.build index b7e04ba..ee315eb 100644 --- a/test cases/failing/78 framework dependency with version/meson.build +++ b/test cases/failing/78 framework dependency with version/meson.build @@ -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') diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build index 94d2cf1..2c483d5 100644 --- a/test cases/objc/2 nsstring/meson.build +++ b/test cases/objc/2 nsstring/meson.build @@ -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 diff --git a/test cases/osx/6 multiframework/meson.build b/test cases/osx/6 multiframework/meson.build index 2884624..57e5d61 100644 --- a/test cases/osx/6 multiframework/meson.build +++ b/test cases/osx/6 multiframework/meson.build @@ -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', |