From d75fc3287e35d735ee58ffc09ec6cea2241f864b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 21 Nov 2017 14:34:00 -0800 Subject: tests: Don't run xcode 8 tests on xcode 9 It lacks the necessary SDKs to run the tests. --- test cases/osx/3 has function xcode8/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test cases/osx/3 has function xcode8/meson.build b/test cases/osx/3 has function xcode8/meson.build index 300d352bf..58d1a1dfa 100644 --- a/test cases/osx/3 has function xcode8/meson.build +++ b/test cases/osx/3 has function xcode8/meson.build @@ -7,8 +7,12 @@ sdk_args = ['-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/M args_10_11 = ['-mmacosx-version-min=10.11'] + sdk_args args_10_12 = ['-mmacosx-version-min=10.12'] + sdk_args +# XCode 9 location for the macOS 10.13 SDK +sdk_args = ['-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk'] +args_10_12 = ['-mmacosx-version-min=10.13'] + sdk_args + # Test requires XCode 8 which has the MacOSX 10.12 SDK -if cc.version().version_compare('>=8.0') +if cc.version().version_compare('>=8.0') and cc.version().version_compare('<9.0') if cc.has_function('clock_gettime', args : args_10_11, prefix : '#include ') error('Should not have found clock_gettime via when targetting Mac OS X 10.11') endif @@ -22,5 +26,5 @@ if cc.version().version_compare('>=8.0') error('Did NOT find clock_gettime w/o a prototype when targetting Mac OS X 10.12') endif else - message('Test needs XCode 8, skipping...') + error('MESON_SKIP_TEST Test needs XCode 8.') endif -- cgit v1.2.3