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

tester: ignore if killall adb failed

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-03-25 10:56:50 +01:00
parent 1cf05b4fd2
commit 8e59bd9c1d
4 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
liblinphone_tester/Makefile
View file

@ -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

8
liblinphone_tester/custom_rules.xml
View file

@ -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" />

6
tests/Makefile
View file

@ -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 ../

16
tests/custom_rules.xml
View file

@ -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">