From 8e59bd9c1d2458ebfeb5d2a2598b3acc4d3a6bfe Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 25 Mar 2015 10:56:50 +0100
Subject: [PATCH] tester: ignore if `killall adb` failed

---
 liblinphone_tester/Makefile         |  6 +++++-
 liblinphone_tester/custom_rules.xml |  8 --------
 tests/Makefile                      |  6 +++++-
 tests/custom_rules.xml              | 16 ++++------------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index 1899a7cc2..c8505164d 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -1,5 +1,9 @@
+# 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
+	killall adb 2>/dev/null || true
+	adb start-server
 
 all: clean
 	ant debug install
diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml
index 0343462fd..afad7673e 100644
--- a/liblinphone_tester/custom_rules.xml
+++ b/liblinphone_tester/custom_rules.xml
@@ -18,14 +18,6 @@
 		</tstamp>
 		<echo>Adb log files are put in ${archive.name}.zip</echo>
 
-		<!-- 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 -->
-		<exec executable="bash" >
-			<arg value="-c" />
-			<arg value="killall adb" />
-		</exec>
-
 		<exec executable="adb" >
 			<arg value="logcat" />
 			<arg value="-c" />
diff --git a/tests/Makefile b/tests/Makefile
index 49254f07f..78cca1f77 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,8 +8,12 @@ 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
+	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 ../
diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml
index 61f5a8c71..c67978fed 100644
--- a/tests/custom_rules.xml
+++ b/tests/custom_rules.xml
@@ -8,14 +8,6 @@
 			<format property="archive.name" pattern="'linphonetester_'yyyyMMdd_HHmmss" />
 		</tstamp>
 
-		<!-- 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 -->
-		<exec executable="bash" >
-			<arg value="-c" />
-			<arg value="killall adb" />
-		</exec>
-
 		<echo>Adb log files are put in ${archive.name}.zip</echo>
 		<exec executable="adb" >
 			<arg value="logcat" />
@@ -37,10 +29,10 @@
 		</exec>
 
 		<condition property="has.crashed" >
-            <or>
-                <resourcecontains resource="${output.file}" substring="Process crashed" />
-                <resourcecontains resource="${output.file}" substring="Native crash" />
-            </or>
+			<or>
+				<resourcecontains resource="${output.file}" substring="Process crashed" />
+				<resourcecontains resource="${output.file}" substring="Native crash" />
+			</or>
 
 		</condition>
 		<exec executable="bash" unless:set="has.crashed">