From d5169eaa68f5598fd39d63f732ae85d94771823b Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 25 Mar 2015 10:05:59 +0100
Subject: [PATCH] custom_rules.xml: testers should use `killall adb` before
 starting in case of previous crash hanging adb connection

---
 liblinphone_tester/custom_rules.xml | 8 ++++++++
 tests/custom_rules.xml              | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml
index afad7673e..0343462fd 100644
--- a/liblinphone_tester/custom_rules.xml
+++ b/liblinphone_tester/custom_rules.xml
@@ -18,6 +18,14 @@
 		</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/custom_rules.xml b/tests/custom_rules.xml
index 3445f9bad..61f5a8c71 100644
--- a/tests/custom_rules.xml
+++ b/tests/custom_rules.xml
@@ -7,6 +7,15 @@
 		<tstamp>
 			<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" />