From e3935e105e817a65b2209cf318f1b267d68a796f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 30 Mar 2015 11:13:51 +0200 Subject: [PATCH] tester: use linphone_core_set_log_collection_path to set writable directory for cache files & update submodules --- .gitignore | 3 ++- LinphoneTester Tests/LinphoneTester_Tests.m | 3 ++- LinphoneTester/MasterViewController.m | 4 +++- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7e8bce008..d2bd1744b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ liblinphone-iphone-sdk*.zip xcuserdata/ Classes/LinphoneIOSVersion.h Pods/ -build \ No newline at end of file +build +test-reports diff --git a/LinphoneTester Tests/LinphoneTester_Tests.m b/LinphoneTester Tests/LinphoneTester_Tests.m index e9b58c15a..0f0ed3914 100644 --- a/LinphoneTester Tests/LinphoneTester_Tests.m +++ b/LinphoneTester Tests/LinphoneTester_Tests.m @@ -63,7 +63,8 @@ void LSLog(NSString* fmt, ...){ bc_tester_read_dir_prefix = bundle; bc_tester_writable_dir_prefix = documents; - + linphone_core_set_log_collection_path(bc_tester_writable_dir_prefix); + liblinphone_tester_keep_accounts(TRUE); int count = bc_tester_nb_suites(); diff --git a/LinphoneTester/MasterViewController.m b/LinphoneTester/MasterViewController.m index 55c6c2124..f4ebf40b9 100644 --- a/LinphoneTester/MasterViewController.m +++ b/LinphoneTester/MasterViewController.m @@ -70,11 +70,13 @@ static void linphone_log_function(OrtpLogLevel lev, const char *fmt, va_list arg NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); documentPath = [paths objectAtIndex:0]; + + bc_tester_init((void (*)(int, const char *fm, va_list))linphone_log_function, ORTP_MESSAGE, ORTP_ERROR); liblinphone_tester_add_suites(); - bc_tester_init((void (*)(int, const char *fm, va_list))linphone_log_function, ORTP_MESSAGE, ORTP_ERROR); bc_tester_read_dir_prefix = [bundlePath UTF8String]; bc_tester_writable_dir_prefix = [documentPath UTF8String]; + linphone_core_set_log_collection_path(bc_tester_writable_dir_prefix); LSLog(@"Bundle path: %@", bundlePath); LSLog(@"Document path: %@", documentPath); diff --git a/submodules/belle-sip b/submodules/belle-sip index 44447d138..abb6f4fa1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 44447d1389cfb6adc4e1c9e9aa3a6f626a6e2b57 +Subproject commit abb6f4fa1984e749c6bec61c6efdacee97b0b992 diff --git a/submodules/linphone b/submodules/linphone index 3ceb33ad2..873d01e1d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3ceb33ad2c908376825131b0336eb0be6a4162e5 +Subproject commit 873d01e1deb747f1c0a8896df6ac6d7e53793d23