aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-10-25 11:35:30 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2018-10-27 16:08:44 +0300
commit0d33916841a198f4ee085d57bdebf23358ec3879 (patch)
tree75e8ff12a25ca0f684308de81eeba202fb63f204
parentff9ba84426629eb8f66c9c2c65526bad5f733726 (diff)
downloadmeson-0d33916841a198f4ee085d57bdebf23358ec3879.zip
meson-0d33916841a198f4ee085d57bdebf23358ec3879.tar.gz
meson-0d33916841a198f4ee085d57bdebf23358ec3879.tar.bz2
tests/llvm: Allow test to run with static-only llvm
Like on windows, where shared llvm isn't support.
-rw-r--r--test cases/frameworks/15 llvm/meson.build25
1 files changed, 17 insertions, 8 deletions
diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
index e05fddd..b43bb87 100644
--- a/test cases/frameworks/15 llvm/meson.build
+++ b/test cases/frameworks/15 llvm/meson.build
@@ -2,18 +2,29 @@ project('llvmtest', ['c', 'cpp'], default_options : ['c_std=c99'])
d = dependency('llvm', required : false)
if not d.found()
- error('MESON_SKIP_TEST llvm not found.')
+ d = dependency('llvm', required : false, static : true)
+ if not d.found()
+ error('MESON_SKIP_TEST llvm not found.')
+ else
+ static = true
+ endif
+else
+ static = false
endif
-d = dependency('llvm', modules : 'not-found', required : false)
+d = dependency('llvm', modules : 'not-found', required : false, static : static)
assert(d.found() == false, 'not-found llvm module found')
-d = dependency('llvm', version : '<0.1', required : false)
+d = dependency('llvm', version : '<0.1', required : false, static : static)
assert(d.found() == false, 'ancient llvm module found')
-d = dependency('llvm', optional_modules : 'not-found', required : false)
+d = dependency('llvm', optional_modules : 'not-found', required : false, static : static)
assert(d.found() == true, 'optional module stopped llvm from being found.')
+# Check we can apply a version constraint
+d = dependency('llvm', version : ['< 500', '>=@0@'.format(d.version())], required: false, static : static)
+assert(d.found() == true, 'Cannot set version constraints')
+
dep_tinfo = dependency('tinfo', required : false)
if not dep_tinfo.found()
cpp = meson.get_compiler('cpp')
@@ -35,12 +46,10 @@ foreach static : [true, false]
'sum.c',
dependencies : [
llvm_dep, dep_tinfo,
- dependency('zlib'),
+ # zlib will be statically linked on windows
+ dependency('zlib', required : host_machine.system() != 'windows'),
meson.get_compiler('c').find_library('dl', required : false),
]
)
endif
endforeach
-
-# Check we can apply a version constraint
-dependency('llvm', version: '>=@0@'.format(d.version()))