reactivate dub tests

Closes: https://github.com/mesonbuild/meson/pull/12143
pull/13517/head
Remi Thebault 2 years ago committed by Sam James
parent 5035726fa8
commit 29176464de
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
  1. 7
      test cases/d/11 dub/meson.build
  2. 7
      test cases/d/14 dub with deps/meson.build

@ -1,12 +1,15 @@
project('dub-example', 'd') project('dub-example', 'd')
error('MESON_SKIP_TEST: Dub support is broken at the moment (#11773)')
dub_exe = find_program('dub', required : false) dub_exe = find_program('dub', required : false)
if not dub_exe.found() if not dub_exe.found()
error('MESON_SKIP_TEST: Dub not found') error('MESON_SKIP_TEST: Dub not found')
endif endif
dub_ver = dub_exe.version()
if dub_ver.version_compare('>1.31.1') and dub_ver.version_compare('<1.35.0')
error('MESON_SKIP_TEST: Incompatible Dub version ' + dub_ver)
endif
urld_dep = dependency('urld', method: 'dub') urld_dep = dependency('urld', method: 'dub')
test_exe = executable('test-urld', 'test.d', dependencies: urld_dep) test_exe = executable('test-urld', 'test.d', dependencies: urld_dep)

@ -1,12 +1,15 @@
project('dub-with-deps-example', ['d']) project('dub-with-deps-example', ['d'])
error('MESON_SKIP_TEST: Dub support is broken at the moment (#11773)')
dub_exe = find_program('dub', required : false) dub_exe = find_program('dub', required : false)
if not dub_exe.found() if not dub_exe.found()
error('MESON_SKIP_TEST: Dub not found') error('MESON_SKIP_TEST: Dub not found')
endif endif
dub_ver = dub_exe.version()
if dub_ver.version_compare('>1.31.1') and dub_ver.version_compare('<1.35.0')
error('MESON_SKIP_TEST: Incompatible Dub version')
endif
if meson.get_compiler('d').get_id() == 'gcc' if meson.get_compiler('d').get_id() == 'gcc'
error('MESON_SKIP_TEST: can\'t build dependencies with GDC') error('MESON_SKIP_TEST: can\'t build dependencies with GDC')
elif meson.get_compiler('d').get_id() == 'llvm' elif meson.get_compiler('d').get_id() == 'llvm'

Loading…
Cancel
Save