Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

avoid using adb kill-server to stop adb logcat

Browse source
This commit is contained in:
Jehan Monnier 2014-09-12 09:23:07 +02:00
parent 5ff7053d75
commit 20a45a72ae
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
liblinphone_tester/adb-log-start.sh Executable file
View file

@ -0,0 +1,4 @@
#! /bin/bash
adb logcat -v time > $1 &
echo $! >adb.pid

10
liblinphone_tester/custom_rules.xml
View file

@ -19,9 +19,8 @@
</tstamp> </tstamp>
<echo>Adb log files are put in ${archive.name}.zip</echo> <echo>Adb log files are put in ${archive.name}.zip</echo>
<exec executable="bash" spawn="true"> <exec executable="adb-log-start.sh" >
<arg value="-c"/> <arg value=" ${archive.name}" />
<arg value="adb logcat -v time > ${archive.name}" />
</exec> </exec>
<exec executable="bash"> <exec executable="bash">
<arg value="-c"/> <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}"/> <arg value="adb shell am instrument -r -w org.linphone.tester/org.linphone.tester.TestRunner | tee ${output.file}"/>
</exec> </exec>
<!-- hack to stop adb logcat--> <!-- hack to stop adb logcat-->
<exec executable="adb" > <exec executable="bash" >
<arg value="kill-server" /> <arg value="-c" />
<arg value="kill `cat adb.pid`" />
</exec> </exec>
<zip destfile="${archive.name}.zip"> <zip destfile="${archive.name}.zip">
<fileset dir="." includes="${archive.name}"/> <fileset dir="." includes="${archive.name}"/>