mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix liblinphone android tester

Browse source
This commit is contained in:
Jehan Monnier 2014-08-04 09:07:28 +02:00
parent 48a2e6622c
commit 113dece9cc
4 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
console/commands.c
View file

@ -515,7 +515,7 @@ lpc_cmd_help(LinphoneCore *lc, char *arg)
i=0; i=0;
while (advanced_commands[i].help) while (advanced_commands[i].help)
{ {
linphonec_out("%10.10s\t%s\n", advanced_commands[i].name, linphonec_out("%20.20s\t%s\n", advanced_commands[i].name,
advanced_commands[i].help); advanced_commands[i].help);
i++; i++;
} }

8
tester/liblinphone_tester.c
View file

@ -27,9 +27,6 @@
#ifdef ANDROID #ifdef ANDROID
extern void AndroidPrintf(FILE *stream, const char *fmt, ...);
#define fprintf(file, fmt, ...) AndroidPrintf(file, fmt, ##__VA_ARGS__)
#include <android/log.h> #include <android/log.h>
#include <jni.h> #include <jni.h>
#include <CUnit/Util.h> #include <CUnit/Util.h>
@ -118,8 +115,9 @@ static void liblinphone_tester_qnx_log_handler(OrtpLogLevel lev, const char *fmt
#endif /* __QNX__ */ #endif /* __QNX__ */
void helper(const char *name) { void helper(const char *name) {
fprintf(stderr,"%s --help\n" liblinphone_tester_fprintf(stderr,"%s --help\n"
"\t\t\t--verbose\n" "\t\t\t--verbose\n"
"\t\t\t--silent\n" "\t\t\t--silent\n"
"\t\t\t--list-suites\n" "\t\t\t--list-suites\n"
@ -197,7 +195,7 @@ int main (int argc, char *argv[])
liblinphone_tester_list_suite_tests(suite_name); liblinphone_tester_list_suite_tests(suite_name);
return 0; return 0;
} else { } else {
fprintf(stderr, "Unknown option \"%s\"\n", argv[i]); \ liblinphone_tester_fprintf(stderr, "Unknown option \"%s\"\n", argv[i]); \
helper(argv[0]); helper(argv[0]);
return -1; return -1;
} }

2
tester/liblinphone_tester.h
View file

@ -248,5 +248,7 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
void liblinphone_tester_clock_start(MSTimeSpec *start); void liblinphone_tester_clock_start(MSTimeSpec *start);
bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms); bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
int liblinphone_tester_fprintf(FILE * restrict stream, const char * restrict format, ...);
#endif /* LIBLINPHONE_TESTER_H_ */ #endif /* LIBLINPHONE_TESTER_H_ */

21
tester/tester.c
View file

@ -294,7 +294,7 @@ int liblinphone_tester_test_suite_index(const char *suite_name) {
void liblinphone_tester_list_suites() { void liblinphone_tester_list_suites() {
int j; int j;
for(j=0;j<liblinphone_tester_nb_test_suites();j++) { for(j=0;j<liblinphone_tester_nb_test_suites();j++) {
fprintf(stdout, "%s\n", liblinphone_tester_test_suite_name(j)); liblinphone_tester_fprintf(stdout, "%s\n", liblinphone_tester_test_suite_name(j));
} }
} }
@ -302,7 +302,7 @@ void liblinphone_tester_list_suite_tests(const char *suite_name) {
int j; int j;
for( j = 0; j < liblinphone_tester_nb_tests(suite_name); j++) { for( j = 0; j < liblinphone_tester_nb_tests(suite_name); j++) {
const char *test_name = liblinphone_tester_test_name(suite_name, j); const char *test_name = liblinphone_tester_test_name(suite_name, j);
fprintf(stdout, "%s\n", test_name); liblinphone_tester_fprintf(stdout, "%s\n", test_name);
} }
} }
@ -443,4 +443,21 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
CU_cleanup_registry(); CU_cleanup_registry();
return ret; return ret;
} }
#ifdef ANDROID
/*implemented in cunit*/
extern void AndroidPrintf(FILE *stream, const char *fmt, ...);
#endif
int liblinphone_tester_fprintf(FILE * restrict stream, const char * restrict format, ...) {
va_list args;
va_start(args, format);
int result;
#ifndef ANDROID
result = vfprintf(stream,format,args);
#else
/*used by liblinphone tester to retrieve suite list*/
result = AndroidPrintf(stream, format, args);
#endif
va_end(args);
return result;
}