From f0b750b7341fa08c6aaf7d37e43bf2101946e33e Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 15 Jul 2015 16:13:09 +0200 Subject: [PATCH] tester: allow launch of tests from outside of tester/ directory --- mediastreamer2 | 2 +- oRTP | 2 +- tester/liblinphone_tester.c | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 268a419f2..df2d2b8c3 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 268a419f274a637173f8ea748b8d99c9bd8c2f2e +Subproject commit df2d2b8c353fe1ad6680801943d4db2a216e2d6a diff --git a/oRTP b/oRTP index ef3258413..2c4e6fad9 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit ef3258413d81f38033b15cb14362be26471d96d3 +Subproject commit 2c4e6fad977d139676e8477ae195f87a98272155 diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index 81393651d..69e364d47 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -196,6 +196,14 @@ int main (int argc, char *argv[]) liblinphone_tester_init(NULL); + { + char res_dir[128] = {0}; + // this allows to launch liblinphone_tester from outside of tester directory + strncpy(res_dir, argv[0], strstr(argv[0], ".libs")-argv[0]); + bc_tester_set_resource_dir_prefix(res_dir); + bc_tester_set_writable_dir_prefix(res_dir); + } + for(i = 1; i < argc; ++i) { if (strcmp(argv[i], "--verbose") == 0) { linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); @@ -226,14 +234,14 @@ int main (int argc, char *argv[]) } else if (strcmp(argv[i],"--keep-recorded-files")==0){ liblinphone_tester_keep_recorded_files(TRUE); } else { - int ret = bc_tester_parse_args(argc, argv, i); - if (ret>0) { - i += ret - 1; + int bret = bc_tester_parse_args(argc, argv, i); + if (bret>0) { + i += bret - 1; continue; - } else if (ret<0) { + } else if (bret<0) { bc_tester_helper(argv[0], liblinphone_helper); } - return ret; + return bret; } }