meson: update tests

Change-Id: I0a72cd58d0c3822ecb99366f2e96c10eb81d7900

meson.build

@@ -6,7 +6,6 @@ project('jami-daemon', ['c', 'cpp'],
        )
 
 modpkgconfig = import('pkgconfig')
-modcmake = import('cmake')
 
 if host_machine.system() == 'darwin'
     add_languages('objcpp')
@@ -19,7 +18,7 @@ depthreads = dependency('threads')
 depopendht        = dependency('opendht', version: '>= 2.1.0')
 depgnutls         = dependency('gnutls', version: '>= 3.6.7')
 depnettle         = dependency('nettle', version: '>= 3.0.0')
-deplibpjproject = dependency('libpjproject')
+deplibpjproject   = dependency('libpjproject') # a custom fork, see contrib/src/pjproject/rules.mak
 deplibgit2        = dependency('libgit2', version: '>= 1.1.0')
 deplibsecp256k1   = dependency('libsecp256k1', version: '>= 0.1')
 deplibavcodec     = dependency('libavcodec', version: '>= 56.60.100')
@@ -147,8 +146,7 @@ configure_file(
     output: 'config.h',
     configuration: conf
 )
-add_project_arguments('-DHAVE_CONFIG_H', language: 'cpp')
-add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
+add_project_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])
 
 #################################################
 # Build targets

src/meson.build

@@ -38,8 +38,8 @@ libjami_sources = files(
     'jamidht/eth/libdevcore/FixedHash.cpp',
     'jamidht/eth/libdevcore/SHA3.cpp',
     'jamidht/eth/libdevcrypto/Common.cpp',
-    'jamidht/accountarchive.cpp',
     'jamidht/account_manager.cpp',
+    'jamidht/accountarchive.cpp',
     'jamidht/archive_account_manager.cpp',
     'jamidht/channeled_transport.cpp',
     'jamidht/contact_list.cpp',
@@ -92,6 +92,18 @@ libjami_sources = files(
     'media/socket_pair.cpp',
     'media/srtp.c',
     'media/system_codec_container.cpp',
+    'sip/pres_sub_client.cpp',
+    'sip/pres_sub_server.cpp',
+    'sip/sdes_negotiator.cpp',
+    'sip/sdp.cpp',
+    'sip/sipaccount.cpp',
+    'sip/sipaccount_config.cpp',
+    'sip/sipaccountbase.cpp',
+    'sip/sipaccountbase_config.cpp',
+    'sip/sipcall.cpp',
+    'sip/sippresence.cpp',
+    'sip/siptransport.cpp',
+    'sip/sipvoiplink.cpp',
     'account.cpp',
     'account_config.cpp',
     'account_factory.cpp',
@@ -109,18 +121,6 @@ libjami_sources = files(
     'manager.cpp',
     'preferences.cpp',
     'ring_api.cpp',
-    'sip/pres_sub_client.cpp',
-    'sip/pres_sub_server.cpp',
-    'sip/sdes_negotiator.cpp',
-    'sip/sdp.cpp',
-    'sip/sipaccountbase.cpp',
-    'sip/sipaccount.cpp',
-    'sip/sipaccountbase_config.cpp',
-    'sip/sipaccount_config.cpp',
-    'sip/sipcall.cpp',
-    'sip/sippresence.cpp',
-    'sip/siptransport.cpp',
-    'sip/sipvoiplink.cpp',
     'scheduled_executor.cpp',
     'string_utils.cpp',
     'threadloop.cpp',

test/meson.build

@@ -4,7 +4,7 @@
 ut_includedirs = ['unitTest', '../src', libjami_includedirs]
 ut_dependencies = [depjami, depcppunit, libjami_dependencies]
 ut_workdir = meson.project_source_root() / 'test' / 'unitTest'
-ut_library = static_library('ut_library',
+ut_library = static_library('common',
     sources: files('unitTest/common.cpp'),
     include_directories: ut_includedirs,
     dependencies: ut_dependencies
@@ -21,16 +21,6 @@ test('account_archive', ut_account_archive,
     workdir: ut_workdir, is_parallel: false, timeout: 1800
 )
 
-ut_migration = executable('ut_migration',
-    sources: files('unitTest/account_archive/migration.cpp'),
-    include_directories: ut_includedirs,
-    dependencies: ut_dependencies,
-    link_with: ut_library
-)
-test('migration', ut_migration,
-    workdir: ut_workdir, is_parallel: false, timeout: 1800
-)
-
 
 ut_account_factory = executable('ut_account_factory',
     sources: files('unitTest/account_factory/testAccount_factory.cpp'),
@@ -98,17 +88,6 @@ test('certificate_store', ut_certificate_store,
 )
 
 
-ut_compatibility = executable('ut_compatibility',
-    sources: files('unitTest/conversation/compability.cpp'),
-    include_directories: ut_includedirs,
-    dependencies: ut_dependencies,
-    link_with: ut_library
-)
-test('compatibility', ut_compatibility,
-    workdir: ut_workdir, is_parallel: false, timeout: 1800
-)
-
-
 ut_conference = executable('ut_conference',
     sources: files('unitTest/call/conference.cpp'),
     include_directories: ut_includedirs,
@@ -120,36 +99,39 @@ test('conference', ut_conference,
 )
 
 
-ut_recorder = executable('ut_recorder',
-    sources: files('unitTest/call/recorder.cpp'),
+ut_connection_manager = executable('ut_connection_manager',
+    sources: files('unitTest/connectionManager/connectionManager.cpp'),
     include_directories: ut_includedirs,
     dependencies: ut_dependencies,
     link_with: ut_library
 )
-test('conference', ut_recorder,
+test('connection_manager', ut_connection_manager,
     workdir: ut_workdir, is_parallel: false, timeout: 1800
 )
 
-ut_connection_manager = executable('ut_connection_manager',
-    sources: files('unitTest/connectionManager/connectionManager.cpp'),
+
+ut_conversation = executable('ut_conversation',
+    sources: files(
+        'unitTest/conversation/conversationcommon.cpp',
+        'unitTest/conversation/conversation.cpp'),
     include_directories: ut_includedirs,
     dependencies: ut_dependencies,
     link_with: ut_library
 )
-test('connection_manager', ut_connection_manager,
+test('conversation', ut_conversation,
     workdir: ut_workdir, is_parallel: false, timeout: 1800
 )
 
 
-ut_conversation = executable('ut_conversation',
+ut_conversation_call = executable('ut_conversation_call',
     sources: files(
         'unitTest/conversation/conversationcommon.cpp',
-        'unitTest/conversation/conversation.cpp'),
+        'unitTest/conversation/call.cpp'),
     include_directories: ut_includedirs,
     dependencies: ut_dependencies,
     link_with: ut_library
 )
-test('conversation', ut_conversation,
+test('conversation_call', ut_conversation_call,
     workdir: ut_workdir, is_parallel: false, timeout: 1800
 )
 
@@ -310,6 +292,17 @@ test('media_frame', ut_media_frame,
 )
 
 
+ut_media_player = executable('ut_media_player',
+    sources: files('unitTest/media/test_media_player.cpp'),
+    include_directories: ut_includedirs,
+    dependencies: ut_dependencies,
+    link_with: ut_library
+)
+test('media_player', ut_media_player,
+    workdir: ut_workdir, is_parallel: false, timeout: 1800
+)
+
+
 ut_media_negotiation = executable('ut_media_negotiation',
     sources: files('unitTest/media_negotiation/media_negotiation.cpp'),
     include_directories: ut_includedirs,
@@ -321,6 +314,28 @@ test('media_negotiation', ut_media_negotiation,
 )
 
 
+ut_migration = executable('ut_migration',
+    sources: files('unitTest/account_archive/migration.cpp'),
+    include_directories: ut_includedirs,
+    dependencies: ut_dependencies,
+    link_with: ut_library
+)
+test('migration', ut_migration,
+    workdir: ut_workdir, is_parallel: false, timeout: 1800
+)
+
+
+ut_recorder = executable('ut_recorder',
+    sources: files('unitTest/call/recorder.cpp'),
+    include_directories: ut_includedirs,
+    dependencies: ut_dependencies,
+    link_with: ut_library
+)
+test('recorder', ut_recorder,
+    workdir: ut_workdir, is_parallel: false, timeout: 1800
+)
+
+
 ut_resampler = executable('ut_resampler',
     sources: files('unitTest/media/audio/test_resampler.cpp'),
     include_directories: ut_includedirs,
@@ -365,17 +380,6 @@ test('sip_basic_calls', ut_sip_basic_calls,
 )
 
 
-#ut_sip_empty_offer = executable('ut_sip_empty_offer',
-#    sources: files('unitTest/sip_account/sip_empty_offer.cpp'),
-#    include_directories: ut_includedirs,
-#    dependencies: ut_dependencies,
-#    link_with: ut_library
-#)
-#test('sip_empty_offer', ut_sip_empty_offer,
-#    workdir: ut_workdir, is_parallel: false, timeout: 1800
-#)
-
-
 ut_sip_srtp = executable('ut_sip_srtp',
     sources: files('unitTest/sip_account/sip_srtp.cpp'),
     include_directories: ut_includedirs,
@@ -387,17 +391,6 @@ test('sip_srtp', ut_sip_srtp,
 )
 
 
-ut_smart_tools = executable('ut_smart_tools',
-    sources: files('unitTest/smartools/testSmartools.cpp'),
-    include_directories: ut_includedirs,
-    dependencies: ut_dependencies,
-    link_with: ut_library
-)
-test('smart_tools', ut_smart_tools,
-    workdir: ut_workdir, is_parallel: false, timeout: 1800
-)
-
-
 ut_string_utils = executable('ut_string_utils',
     sources: files('unitTest/string_utils/testString_utils.cpp'),
     include_directories: ut_includedirs,
@@ -432,35 +425,35 @@ test('utf8_utils', ut_utf8_utils,
 
 
 if conf.get('ENABLE_VIDEO')
-    ut_video_input = executable('ut_video_input',
-        sources: files('unitTest/media/video/testVideo_input.cpp'),
+    ut_plugins = executable('ut_plugins',
+        sources: files('unitTest/plugins/plugins.cpp'),
         include_directories: ut_includedirs,
         dependencies: ut_dependencies,
         link_with: ut_library
     )
-    test('video_input', ut_video_input,
+    test('plugins', ut_plugins,
         workdir: ut_workdir, is_parallel: false, timeout: 1800
     )
 
 
-    ut_video_scaler = executable('ut_video_scaler',
-        sources: files('unitTest/media/video/test_video_scaler.cpp'),
+    ut_video_input = executable('ut_video_input',
+        sources: files('unitTest/media/video/testVideo_input.cpp'),
         include_directories: ut_includedirs,
         dependencies: ut_dependencies,
         link_with: ut_library
     )
-    test('video_scaler', ut_video_scaler,
+    test('video_input', ut_video_input,
         workdir: ut_workdir, is_parallel: false, timeout: 1800
     )
 
 
-    ut_plugins = executable('ut_plugins',
-        sources: files('unitTest/plugins/plugins.cpp'),
+    ut_video_scaler = executable('ut_video_scaler',
+        sources: files('unitTest/media/video/test_video_scaler.cpp'),
         include_directories: ut_includedirs,
         dependencies: ut_dependencies,
         link_with: ut_library
     )
-    test('plugins', ut_plugins,
+    test('video_scaler', ut_video_scaler,
         workdir: ut_workdir, is_parallel: false, timeout: 1800
     )
 endif