compat/meson.build

@@ -11,3 +11,49 @@ if libcompat_sources.length() > 0
         install_dir: get_option('libdir') / 'vlc'
     )
 endif
+
+heap_alloc_env = environment({'ASAN_OPTIONS': 'allocator_may_return_null=1'})
+vlc_tests += {
+    'name': 'heap',
+    'sources': files('test/heap.c'),
+    'suite': ['compat'],
+    'link_with': [vlc_libcompat],
+    'env': heap_alloc_env,
+}
+
+vlc_tests += {
+    'name': 'strnstr',
+    'sources': files('test/strnstr.c'),
+    'suite': ['compat'],
+    'link_with': [vlc_libcompat],
+}
+
+vlc_tests += {
+    'name': 'ckd_ckd',
+    'sources': files('test/ckd.c'),
+    'c_args': ['-DTEST_CKD'],
+    'suite': ['compat'],
+    'link_with': [vlc_libcompat],
+}
+
+ckd_builtin_cargs = ['-DTEST_BUILTIN']
+if cdata.has('HAVE_STDCKDINT_H')
+    ckd_builtin_cargs += '-DHAVE_CKD'
+endif
+vlc_tests += {
+    'name': 'ckd_builtin',
+    'sources': files('test/ckd.c'),
+    'c_args': ckd_builtin_cargs,
+    'suite': ['compat'],
+    'link_with': [vlc_libcompat],
+}
+
+vlc_tests += {
+    'name': 'ckd_compat',
+    'sources': files('test/ckd.c'),
+    'c_args': ['-DTEST_COMPAT'],
+    'suite': ['compat'],
+    'link_with': [vlc_libcompat],
+}
+
+#TODO: add clock_nanosleep test for Darwin

test/meson.build

@@ -24,6 +24,7 @@ foreach vlc_test: vlc_tests
         'cpp_args',
         'objc_args',
         'include_directories',
+        'env',
     ]
 
     foreach key : vlc_test.keys()
@@ -82,6 +83,7 @@ foreach vlc_test: vlc_tests
             c_args: [vlc_test.get('c_args', []), common_args],
             cpp_args: [vlc_test.get('cpp_args', []), common_args],
             objc_args: [vlc_test.get('objc_args', []), common_args]),
+            env: vlc_test.get('env', []),
         suite: [vlc_test.get('suite', []), 'test'],
         depends: [test_modules_deps])
 endforeach