From 20a45a72ae681927ae3fa02dfbb1766f49c24ce2 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 12 Sep 2014 09:23:07 +0200
Subject: [PATCH] avoid using adb kill-server to stop adb logcat

---
 liblinphone_tester/adb-log-start.sh |  4 ++++
 liblinphone_tester/custom_rules.xml | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100755 liblinphone_tester/adb-log-start.sh

diff --git a/liblinphone_tester/adb-log-start.sh b/liblinphone_tester/adb-log-start.sh
new file mode 100755
index 000000000..73ec81563
--- /dev/null
+++ b/liblinphone_tester/adb-log-start.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+adb logcat -v time > $1 &
+echo $! >adb.pid
+
diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml
index 2519f7a89..aeaa8bc77 100644
--- a/liblinphone_tester/custom_rules.xml
+++ b/liblinphone_tester/custom_rules.xml
@@ -19,9 +19,8 @@
     		</tstamp>
     		<echo>Adb log files are put in ${archive.name}.zip</echo>
 
-  		<exec executable="bash" spawn="true">
-			<arg value="-c"/>
-			<arg value="adb logcat -v time > ${archive.name}" />
+  		<exec executable="adb-log-start.sh" >
+			<arg value=" ${archive.name}" />
 		</exec>
   		<exec executable="bash">
 			<arg value="-c"/>
@@ -31,8 +30,9 @@
 			<arg value="adb shell am instrument -r -w org.linphone.tester/org.linphone.tester.TestRunner | tee ${output.file}"/>
 		</exec>
 		<!-- hack to stop adb logcat-->	
-		<exec executable="adb" >
-			<arg value="kill-server" />
+		<exec executable="bash" >
+			<arg value="-c" />
+			<arg value="kill `cat adb.pid`" />
 		</exec>
 		<zip destfile="${archive.name}.zip">
 			<fileset dir="." includes="${archive.name}"/>