From fe20fea2efeb0b96e54a002745d91e9cb2cc6758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= <francois-simon.fauteux-chapleau@savoirfairelinux.com> Date: Thu, 3 Apr 2025 11:36:03 -0400 Subject: [PATCH] cmake: fix inconsistent test names Some of the unit test executables had different names depending on whether they were built via CMake or Autotools. Change-Id: Ie09ba448e0101035e69d95fc639a8bce0251759b --- CMakeLists.txt | 128 +++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e4ff658f9..bffb316ceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -864,25 +864,25 @@ else() target_link_libraries(ut_conference ut_library) add_test(NAME conference COMMAND ut_conference) - add_executable(ut_test_media_frame test/unitTest/media/test_media_frame.cpp) - target_link_libraries(ut_test_media_frame ut_library) - add_test(NAME test_media_frame COMMAND ut_test_media_frame) + add_executable(ut_media_frame test/unitTest/media/test_media_frame.cpp) + target_link_libraries(ut_media_frame ut_library) + add_test(NAME media_frame COMMAND ut_media_frame) - add_executable(ut_test_video_scaler test/unitTest/media/video/test_video_scaler.cpp) - target_link_libraries(ut_test_video_scaler ut_library) - add_test(NAME test_video_scaler COMMAND ut_test_video_scaler) + add_executable(ut_video_scaler test/unitTest/media/video/test_video_scaler.cpp) + target_link_libraries(ut_video_scaler ut_library) + add_test(NAME video_scaler COMMAND ut_video_scaler) - add_executable(ut_testVideo_input test/unitTest/media/video/testVideo_input.cpp) - target_link_libraries(ut_testVideo_input ut_library) - add_test(NAME testVideo_input COMMAND ut_testVideo_input) + add_executable(ut_video_input test/unitTest/media/video/testVideo_input.cpp) + target_link_libraries(ut_video_input ut_library) + add_test(NAME video_input COMMAND ut_video_input) - add_executable(ut_test_media_filter test/unitTest/media/test_media_filter.cpp) - target_link_libraries(ut_test_media_filter ut_library) - add_test(NAME test_media_filter COMMAND ut_test_media_filter) + add_executable(ut_media_filter test/unitTest/media/test_media_filter.cpp) + target_link_libraries(ut_media_filter ut_library) + add_test(NAME media_filter COMMAND ut_media_filter) - add_executable(ut_test_media_player test/unitTest/media/test_media_player.cpp) - target_link_libraries(ut_test_media_player ut_library) - add_test(NAME test_media_player COMMAND ut_test_media_player) + add_executable(ut_media_player test/unitTest/media/test_media_player.cpp) + target_link_libraries(ut_media_player ut_library) + add_test(NAME media_player COMMAND ut_media_player) endif() add_executable(ut_namedirectory test/unitTest/namedirectory/namedirectory.cpp) @@ -893,9 +893,9 @@ else() target_link_libraries(ut_scheduler ut_library) add_test(NAME scheduler COMMAND ut_scheduler) - add_executable(ut_testAccount_factory test/unitTest/account_factory/testAccount_factory.cpp) - target_link_libraries(ut_testAccount_factory ut_library) - add_test(NAME testAccount_factory COMMAND ut_testAccount_factory) + add_executable(ut_account_factory test/unitTest/account_factory/testAccount_factory.cpp) + target_link_libraries(ut_account_factory ut_library) + add_test(NAME account_factory COMMAND ut_account_factory) add_executable(ut_call test/unitTest/call/call.cpp) target_link_libraries(ut_call ut_library) @@ -909,21 +909,21 @@ else() target_link_libraries(ut_migration ut_library) add_test(NAME migration COMMAND ut_migration) - add_executable(ut_accountArchive test/unitTest/account_archive/account_archive.cpp) - target_link_libraries(ut_accountArchive ut_library) - add_test(NAME accountArchive COMMAND ut_accountArchive) + add_executable(ut_account_archive test/unitTest/account_archive/account_archive.cpp) + target_link_libraries(ut_account_archive ut_library) + add_test(NAME account_archive COMMAND ut_account_archive) - add_executable(ut_mapUtils test/unitTest/map_utils/testMap_utils.cpp) - target_link_libraries(ut_mapUtils ut_library) - add_test(NAME mapUtils COMMAND ut_mapUtils) + add_executable(ut_map_utils test/unitTest/map_utils/testMap_utils.cpp) + target_link_libraries(ut_map_utils ut_library) + add_test(NAME map_utils COMMAND ut_map_utils) - add_executable(ut_sipBasicCalls test/unitTest/sip_account/sip_basic_calls.cpp) - target_link_libraries(ut_sipBasicCalls ut_library) - add_test(NAME sipBasicCalls COMMAND ut_sipBasicCalls) + add_executable(ut_sip_basic_calls test/unitTest/sip_account/sip_basic_calls.cpp) + target_link_libraries(ut_sip_basic_calls ut_library) + add_test(NAME sip_basic_calls COMMAND ut_sip_basic_calls) - add_executable(ut_sipSrtp test/unitTest/sip_account/sip_srtp.cpp) - target_link_libraries(ut_sipSrtp ut_library) - add_test(NAME sipSrtp COMMAND ut_sipSrtp) + add_executable(ut_sip_srtp test/unitTest/sip_account/sip_srtp.cpp) + target_link_libraries(ut_sip_srtp ut_library) + add_test(NAME sip_srtp COMMAND ut_sip_srtp) add_executable(ut_fileTransfer test/unitTest/fileTransfer/fileTransfer.cpp) target_link_libraries(ut_fileTransfer ut_library) @@ -933,21 +933,21 @@ else() target_link_libraries(ut_fileutils ut_library) add_test(NAME fileutils COMMAND ut_fileutils) - add_executable(ut_holdResume test/unitTest/media_negotiation/hold_resume.cpp) - target_link_libraries(ut_holdResume ut_library) - add_test(NAME holdResume COMMAND ut_holdResume) + add_executable(ut_hold_resume test/unitTest/media_negotiation/hold_resume.cpp) + target_link_libraries(ut_hold_resume ut_library) + add_test(NAME hold_resume COMMAND ut_hold_resume) - add_executable(ut_autoAnswer test/unitTest/media_negotiation/auto_answer.cpp) - target_link_libraries(ut_autoAnswer ut_library) - add_test(NAME autoAnswer COMMAND ut_autoAnswer) + add_executable(ut_auto_answer test/unitTest/media_negotiation/auto_answer.cpp) + target_link_libraries(ut_auto_answer ut_library) + add_test(NAME auto_answer COMMAND ut_auto_answer) - add_executable(ut_mediaNegotiation test/unitTest/media_negotiation/media_negotiation.cpp) - target_link_libraries(ut_mediaNegotiation ut_library) - add_test(NAME mediaNegotiation COMMAND ut_mediaNegotiation) + add_executable(ut_media_negotiation test/unitTest/media_negotiation/media_negotiation.cpp) + target_link_libraries(ut_media_negotiation ut_library) + add_test(NAME media_negotiation COMMAND ut_media_negotiation) - add_executable(ut_stringUtils test/unitTest/string_utils/testString_utils.cpp) - target_link_libraries(ut_stringUtils ut_library) - add_test(NAME stringUtils COMMAND ut_stringUtils) + add_executable(ut_string_utils test/unitTest/string_utils/testString_utils.cpp) + target_link_libraries(ut_string_utils ut_library) + add_test(NAME string_utils COMMAND ut_string_utils) add_executable(ut_utf8_utils test/unitTest/utf8_utils/testUtf8_utils.cpp) target_link_libraries(ut_utf8_utils ut_library) @@ -961,9 +961,9 @@ else() target_link_libraries(ut_typers ut_library) add_test(NAME typers COMMAND ut_typers) - add_executable(ut_conversationCall test/unitTest/conversation/call.cpp test/unitTest/conversation/conversationcommon.cpp) - target_link_libraries(ut_conversationCall ut_library) - add_test(NAME conversationCall COMMAND ut_conversationCall) + add_executable(ut_conversation_call test/unitTest/conversation/call.cpp test/unitTest/conversation/conversationcommon.cpp) + target_link_libraries(ut_conversation_call ut_library) + add_test(NAME conversation_call COMMAND ut_conversation_call) add_executable(ut_conversation test/unitTest/conversation/conversation.cpp test/unitTest/conversation/conversationcommon.cpp) target_link_libraries(ut_conversation ut_library) @@ -977,33 +977,25 @@ else() target_link_libraries(ut_conversationMembersEvent ut_library) add_test(NAME conversationMembersEvent COMMAND ut_conversationMembersEvent) - add_executable(ut_conversationFetchSent test/unitTest/conversation/conversationFetchSent.cpp test/unitTest/conversation/conversationcommon.cpp) - target_link_libraries(ut_conversationFetchSent ut_library) - add_test(NAME conversationFetchSent COMMAND ut_conversationFetchSent) + add_executable(ut_conversation_fetch_sent test/unitTest/conversation/conversationFetchSent.cpp test/unitTest/conversation/conversationcommon.cpp) + target_link_libraries(ut_conversation_fetch_sent ut_library) + add_test(NAME conversation_fetch_sent COMMAND ut_conversation_fetch_sent) - add_executable(ut_test_media_encoder test/unitTest/media/test_media_encoder.cpp) - target_link_libraries(ut_test_media_encoder ut_library) - add_test(NAME test_media_encoder COMMAND ut_test_media_encoder) + add_executable(ut_media_encoder test/unitTest/media/test_media_encoder.cpp) + target_link_libraries(ut_media_encoder ut_library) + add_test(NAME media_encoder COMMAND ut_media_encoder) - add_executable(ut_test_media_decoder test/unitTest/media/test_media_decoder.cpp) - target_link_libraries(ut_test_media_decoder ut_library) - add_test(NAME test_media_decoder COMMAND ut_test_media_decoder) + add_executable(ut_media_decoder test/unitTest/media/test_media_decoder.cpp) + target_link_libraries(ut_media_decoder ut_library) + add_test(NAME media_decoder COMMAND ut_media_decoder) - add_executable(ut_test_resampler test/unitTest/media/audio/test_resampler.cpp) - target_link_libraries(ut_test_resampler ut_library) - add_test(NAME test_resampler COMMAND ut_test_resampler) + add_executable(ut_resampler test/unitTest/media/audio/test_resampler.cpp) + target_link_libraries(ut_resampler ut_library) + add_test(NAME resampler COMMAND ut_resampler) - add_executable(ut_test_audio_frame_resizer test/unitTest/media/audio/test_audio_frame_resizer.cpp) - target_link_libraries(ut_test_audio_frame_resizer ut_library) - add_test(NAME test_audio_frame_resizer COMMAND ut_test_audio_frame_resizer) - - # add_executable(ut_test_media_filter test/unitTest/media/test_media_filter.cpp) - # target_link_libraries(ut_test_media_filter ut_library) - # add_test(NAME test_media_filter COMMAND ut_test_media_filter) - - # add_executable(ut_test_media_player test/unitTest/media/test_media_player.cpp) - # target_link_libraries(ut_test_media_player ut_library) - # add_test(NAME test_media_player COMMAND ut_test_media_player) + add_executable(ut_audio_frame_resizer test/unitTest/media/audio/test_audio_frame_resizer.cpp) + target_link_libraries(ut_audio_frame_resizer ut_library) + add_test(NAME audio_frame_resizer COMMAND ut_audio_frame_resizer) if (JAMI_PLUGIN) add_executable(ut_plugins test/unitTest/plugins/plugins.cpp) -- GitLab