submodules: update belle-sip and linphone and fix liblinphone tester
This commit is contained in:
parent
4c315e566c
commit
6ae8d5fbec
5 changed files with 28 additions and 21 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -38,3 +38,7 @@ tests/*$py.class
|
|||
tests/build.xml
|
||||
tests/project.properties
|
||||
ant_password.properties
|
||||
liblinphone_tester/liblinphonetester_*
|
||||
liblinphone_tester/tests.output
|
||||
tests/linphonetester_*
|
||||
tests/tests.output
|
||||
|
|
|
@ -23,9 +23,10 @@ public class LogsActivity extends Activity {
|
|||
|
||||
@Override
|
||||
public void run() {
|
||||
String path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files";
|
||||
String res_path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files";
|
||||
String write_path = mLogsActivity.getCacheDir().getPath();
|
||||
tester = new TesterLogger(mLogsActivity);
|
||||
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path}));
|
||||
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path}));
|
||||
list.addAll(Arrays.asList(mArgs));
|
||||
String[] array = list.toArray(new String[list.size()]);
|
||||
tester.run(array);
|
||||
|
|
|
@ -78,9 +78,11 @@ public class TestUnit extends AndroidTestCase {
|
|||
|
||||
@Override
|
||||
protected void runTest() {
|
||||
String path = getContext().getFilesDir().getPath()+"/config_files";
|
||||
String res_path = getContext().getFilesDir().getPath()+"/config_files";
|
||||
String write_path = getContext().getCacheDir().getPath();
|
||||
Tester tester = new Tester();
|
||||
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path, "--suite", mSuite, "--test", mTest}));
|
||||
|
||||
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path, "--suite", mSuite, "--test", mTest}));
|
||||
String[] array = list.toArray(new String[list.size()]);
|
||||
Assert.assertTrue(tester.run(array) == 0);
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 07233a793594081d5aafc0c6bb14d389dffbfac0
|
||||
Subproject commit 6e76dabb7632e0f58e9c43b2cc86ada5f486c761
|
|
@ -1 +1 @@
|
|||
Subproject commit 46547098cc1f24a394d6aa7c4e7823226ecab0fe
|
||||
Subproject commit 9244a017373d9ddec9170257fec324fb82cb0800
|
Loading…
Reference in a new issue