From 94368c67bd0bbcff80ceeeaa6f408d2be771b3d1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 9 Nov 2016 14:40:32 +0100 Subject: [PATCH] Fix testers --- liblinphone_tester/Makefile | 5 ++++- tests/Makefile | 4 +++- tests/ant.properties | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index c209ffefc..c6e5c12ed 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -1,7 +1,10 @@ ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1) +SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`) all: update-project copy-files - ant debug install + ant clean debug + $(SDK_PLATFORM_TOOLS_PATH)/adb install -g bin/liblinphone_tester-debug.apk + #$(SDK_PLATFORM_TOOLS_PATH)/adb install -g ../bin/Linphone-debug.apk run-all-tests: all ant test diff --git a/tests/Makefile b/tests/Makefile index 6f7d119f2..2e24d9ec1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,7 +14,9 @@ clean: $(SDK_PATH)/android update test-project --path . -m ../ all: clean - $(ANT) debug install + ant clean debug + $(SDK_PLATFORM_TOOLS_PATH)/adb install -g bin/LinphoneTest-debug.apk + $(SDK_PLATFORM_TOOLS_PATH)/adb install -g ../bin/Linphone-debug.apk run-basic-tests: all ant -e test -Dtest.size=small diff --git a/tests/ant.properties b/tests/ant.properties index 15f57bb33..7f387c9fd 100644 --- a/tests/ant.properties +++ b/tests/ant.properties @@ -15,5 +15,5 @@ # 'key.alias' for the name of the key to use. # The password will be asked during the build when you use the 'release' target. -tested.project.dir=. +tested.project.dir=../ test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner