From 6f84ae679023eca175e5964e3ed2d6dce42195eb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 5 Oct 2015 16:21:40 +0200 Subject: [PATCH] Fix two unit tests on Windows 10. --- .../liblinphone-tester/liblinphone-tester.csproj | 3 +++ tester/call_tester.c | 12 ++++++++---- tester/remote_provisioning_tester.c | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build/windows10/liblinphone-tester/liblinphone-tester.csproj b/build/windows10/liblinphone-tester/liblinphone-tester.csproj index 09f9e1742..ab018cc05 100644 --- a/build/windows10/liblinphone-tester/liblinphone-tester.csproj +++ b/build/windows10/liblinphone-tester/liblinphone-tester.csproj @@ -96,6 +96,9 @@ PreserveNewest + + PreserveNewest + diff --git a/tester/call_tester.c b/tester/call_tester.c index 7c245f00e..3b905d808 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -3586,10 +3586,14 @@ static void video_call_snapshot(void) { BC_ASSERT_TRUE(call_succeeded = call_with_params(marie, pauline, marieParams, paulineParams)); BC_ASSERT_PTR_NOT_NULL(callInst = linphone_core_get_current_call(marie->lc)); if((call_succeeded == TRUE) && (callInst != NULL)) { - linphone_call_take_video_snapshot(callInst, filename); - wait_for_until(marie->lc, pauline->lc, &dummy, 1, 5000); - BC_ASSERT_EQUAL(ortp_file_exist(filename), 0, int, "%d"); - remove(filename); + int jpeg_support = linphone_call_take_video_snapshot(callInst, filename); + if (jpeg_support < 0) { + ms_warning("No jpegwriter support!"); + } else { + wait_for_until(marie->lc, pauline->lc, &dummy, 1, 5000); + BC_ASSERT_EQUAL(ortp_file_exist(filename), 0, int, "%d"); + remove(filename); + } end_call(marie, pauline); } ms_free(filename); diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c index 51203ae5f..9bb1e41bf 100644 --- a/tester/remote_provisioning_tester.c +++ b/tester/remote_provisioning_tester.c @@ -110,6 +110,8 @@ static void remote_provisioning_file(void) { return; #elif defined(ANDROID) marie = linphone_core_manager_new2("marie_remote_localfile_android_rc", FALSE); +#elif defined(LINPHONE_WINDOWS_UNIVERSAL) + marie = linphone_core_manager_new2("marie_remote_localfile_win10_rc", FALSE); #else marie = linphone_core_manager_new2("marie_remote_localfile_rc", FALSE); #endif