From 6ea91ce27b7d13d659157ec5c7ee8f3af13b34c4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 17 May 2018 10:05:06 +0200 Subject: [PATCH] fix(call_video_tester): avoid empty array if video is not enabled --- tester/call_video_tester.c | 7 +++---- tester/liblinphone_tester.h | 10 +++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tester/call_video_tester.c b/tester/call_video_tester.c index 70e6ac4bd..d96b7b1a3 100644 --- a/tester/call_video_tester.c +++ b/tester/call_video_tester.c @@ -21,6 +21,7 @@ #include "tester_utils.h" #ifdef VIDEO_ENABLED + static void call_paused_resumed_with_video_base_call_cb(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message) { if (cstate == LinphoneCallUpdatedByRemote) { LinphoneCallParams *params = linphone_core_create_call_params(lc, call); @@ -2228,10 +2229,7 @@ static void video_call_expected_fps_for_high_bandwidth(void) { #endif } -#endif // VIDEO_ENABLED - test_t call_video_tests[] = { -#ifdef VIDEO_ENABLED TEST_NO_TAG("Call paused resumed with video", call_paused_resumed_with_video), TEST_NO_TAG("Call paused resumed with video no sdp ack", call_paused_resumed_with_no_sdp_ack), TEST_NO_TAG("Call paused resumed with video no sdk ack using video policy for resume offers", call_paused_resumed_with_no_sdp_ack_using_video_policy), @@ -2303,8 +2301,9 @@ test_t call_video_tests[] = { TEST_NO_TAG("Video call expected FPS for low bandwidth", video_call_expected_fps_for_low_bandwidth), TEST_NO_TAG("Video call expected FPS for regular bandwidth", video_call_expected_fps_for_regular_bandwidth), TEST_NO_TAG("Video call expected FPS for high bandwidth", video_call_expected_fps_for_high_bandwidth) -#endif }; test_suite_t call_video_test_suite = {"Video Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each, sizeof(call_video_tests) / sizeof(call_video_tests[0]), call_video_tests}; + +#endif // ifdef VIDEO_ENABLED diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h index f10d14029..3afcb77c7 100644 --- a/tester/liblinphone_tester.h +++ b/tester/liblinphone_tester.h @@ -41,7 +41,11 @@ extern "C" { extern test_suite_t account_creator_test_suite; extern test_suite_t call_test_suite; -extern test_suite_t call_video_test_suite; + +#if VIDEO_ENABLED + extern test_suite_t call_video_test_suite; +#endif + extern test_suite_t clonable_object_test_suite; extern test_suite_t conference_event_test_suite; extern test_suite_t conference_test_suite; @@ -73,12 +77,12 @@ extern test_suite_t upnp_test_suite; extern test_suite_t video_test_suite; #ifdef VCARD_ENABLED -extern test_suite_t vcard_test_suite; + extern test_suite_t vcard_test_suite; #endif extern test_suite_t audio_bypass_suite; #if HAVE_SIPP -extern test_suite_t complex_sip_call_test_suite; + extern test_suite_t complex_sip_call_test_suite; #endif extern int manager_count;