diff --git a/.gitignore b/.gitignore index 46a512943..d77406d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ submodules/externals/build/cunit/CUnit/ .idea build linphone-android.iml +junit-report.xml diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index a43330b26..1644092aa 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -32,7 +32,7 @@ - \ No newline at end of file + diff --git a/tests/Makefile b/tests/Makefile index cdc238939..fe9c801bd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -7,7 +7,8 @@ run-basic-tests: $(SDK_PATH)/android update test-project --path . -m ../ ant debug ant installd - adb shell am instrument -w -e size small org.linphone.test/android.test.InstrumentationTestRunner + adb shell am instrument -w -e size small org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner + adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > junit-report.xml run-all-tests: $(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test @@ -15,4 +16,5 @@ run-all-tests: $(SDK_PATH)/android update test-project --path . -m ../ ant debug ant installd - adb shell am instrument -w -e size large org.linphone.test/android.test.InstrumentationTestRunner + adb shell am instrument -w -e size large org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner + adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > junit-report.xml diff --git a/tests/ant.properties b/tests/ant.properties index 836edf047..7f387c9fd 100644 --- a/tests/ant.properties +++ b/tests/ant.properties @@ -16,3 +16,4 @@ # The password will be asked during the build when you use the 'release' target. tested.project.dir=../ +test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner diff --git a/tests/libs/android-junit-report-1.5.8.jar b/tests/libs/android-junit-report-1.5.8.jar new file mode 100644 index 000000000..09e6a2d4f Binary files /dev/null and b/tests/libs/android-junit-report-1.5.8.jar differ