Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

submodules: update belle-sip and linphone and fix liblinphone tester

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-28 10:42:58 +02:00
parent 4c315e566c
commit 6ae8d5fbec
5 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -38,3 +38,7 @@ tests/*$py.class
tests/build.xml tests/build.xml
tests/project.properties tests/project.properties
ant_password.properties ant_password.properties
liblinphone_tester/liblinphonetester_*
liblinphone_tester/tests.output
tests/linphonetester_*
tests/tests.output

5
liblinphone_tester/src/org/linphone/tester/LogsActivity.java
View file

@ -23,9 +23,10 @@ public class LogsActivity extends Activity {
@Override @Override
public void run() { 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); 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)); list.addAll(Arrays.asList(mArgs));
String[] array = list.toArray(new String[list.size()]); String[] array = list.toArray(new String[list.size()]);
tester.run(array); tester.run(array);

6
liblinphone_tester/src/org/linphone/tester/TestUnit.java
View file

@ -78,9 +78,11 @@ public class TestUnit extends AndroidTestCase {
@Override @Override
protected void runTest() { 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(); 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()]); String[] array = list.toArray(new String[list.size()]);
Assert.assertTrue(tester.run(array) == 0); Assert.assertTrue(tester.run(array) == 0);
} }

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 07233a793594081d5aafc0c6bb14d389dffbfac0 Subproject commit 6e76dabb7632e0f58e9c43b2cc86ada5f486c761

2
submodules/linphone

@ -1 +1 @@
Subproject commit 46547098cc1f24a394d6aa7c4e7823226ecab0fe Subproject commit 9244a017373d9ddec9170257fec324fb82cb0800