From 885743b8feb8bc2deb73dcf39a5a3d951755263c Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 25 Mar 2015 17:00:00 +0100 Subject: [PATCH] tester: `killall adb` is actually not needed since this is device specific and only needed for HTC... --- liblinphone_tester/Makefile | 9 +-------- tests/Makefile | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index c8505164d..42b2637c1 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -1,11 +1,4 @@ -# Ensure that adb is killed before running anything. This is needed in case -# the previous execution crashed (while adb still running) because adb will not be able to list atached devices -# until any adb is running -clean: - killall adb 2>/dev/null || true - adb start-server - -all: clean +all: ant debug install run-all-tests: all diff --git a/tests/Makefile b/tests/Makefile index 78cca1f77..0383a7073 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,12 +8,7 @@ else ANT=ant -e endif -# Ensure that adb is killed before running anything. This is needed in case -# the previous execution crashed (while adb still running) because adb will not be able to list atached devices -# until any adb is running clean: - killall adb 2>/dev/null || true - $(SDK_PLATFORM_TOOLS_PATH)/adb start-server $(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test $(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone $(SDK_PATH)/android update test-project --path . -m ../