reactivate dub tests

mesonbuild · Aug 20, 2023 · 1b574eb · 1b574eb
1 parent 80a9230
commit 1b574eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/test cases/d/11 dub/meson.build b/test cases/d/11 dub/meson.build
@@ -1,12 +1,15 @@
 project('dub-example', 'd')
 
-error('MESON_SKIP_TEST: Dub support is broken at the moment (#11773)')
-
 dub_exe = find_program('dub', required : false)
 if not dub_exe.found()
   error('MESON_SKIP_TEST: Dub not found')
 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')
 
 test_exe = executable('test-urld', 'test.d', dependencies: urld_dep)

diff --git a/test cases/d/14 dub with deps/meson.build b/test cases/d/14 dub with deps/meson.build
@@ -1,12 +1,15 @@
 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)
 if not dub_exe.found()
     error('MESON_SKIP_TEST: Dub not found')
 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'
     error('MESON_SKIP_TEST: can\'t build dependencies with GDC')
 elif meson.get_compiler('d').get_id() == 'llvm'