make the unit tests work in meson

Author: mmomtchev

meson.build

@@ -16,9 +16,9 @@ if not meson.is_subproject()
         subdir('example/api2-samples')
     endif
 
-#    if get_option('build_tests')
-#        subdir('tests')
-#    endif
+    if get_option('build_tests')
+        subdir('tests')
+    endif
 endif
 
 meson.override_dependency('avcpp', avcpp_dep)

subprojects/catch2.wrap

@@ -1,10 +1,11 @@
 [wrap-file]
-directory = Catch2-2.11.3
+directory = Catch2-3.13.0
+source_url = https://github.com/catchorg/Catch2/archive/v3.13.0.tar.gz
+source_filename = Catch2-3.13.0.tar.gz
+source_hash = 650795f6501af514f806e78c554729847b98db6935e69076f36bb03ed2e985ef
+source_fallback_url = https://wrapdb.mesonbuild.com/v2/catch2_3.13.0-1/get_source/Catch2-3.13.0.tar.gz
+wrapdb_version = 3.13.0-1
 
-source_url = https://github.com/catchorg/Catch2/archive/v2.11.3.zip
-source_filename = Catch2-2.11.3.zip
-source_hash = c5a0a7510379c6f37f70b329986a335a7b8489d67ac417ce8f4262d0cae4cc5d
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/catch2/2.11.3/1/get_zip
-patch_filename = catch2-2.11.3-1-wrap.zip
-patch_hash = 63c09cb68280435040ad304b3dd87ecfe69dbc216608991d0a82569a63119e57
+[provide]
+catch2 = catch2_dep
+catch2-with-main = catch2_with_main_dep

tests/meson.build

@@ -1,29 +1,18 @@
 #get catch2
-catch2 = dependency('catch2', required: true, fallback:['catch2','catch2_dep'])
+catch2 = dependency('catch2-with-main', required: true)
 
-#create main_test as library and export the dependency
-main_test = static_library(
-    'main_test', 
-    'test-main.cpp', 
-    dependencies: [catch2, avcpp_dep]
-)
-
-main_test_dep = declare_dependency(
-    link_with : main_test,
-    dependencies : catch2,
-    version: meson.project_version()
-)
-
-#make both dependencies into one array
-deps = [avcpp_dep]
-deps += main_test_dep
+deps = [avcpp_dep, catch2]
 
 tests = [
-    'Frame',
     'AvDeleter',
-    'Packet',
+    'Buffer',
+    'Codec',
     'Format',
+    'Frame',
+    'Packet',
+    'PixelSampleFormat',
     'Rational',
+    'TimeStamp'
 ]
 
 #create all the tests