Fix custom_rules of tests

This commit is contained in:
Erwan Croze 2016-11-07 14:40:17 +01:00
parent c3ed5f792c
commit 07836cf17e
2 changed files with 21 additions and 13 deletions

View file

@ -62,27 +62,26 @@
<resourcecontains resource="${output.file}" substring="FAILURES" /> <resourcecontains resource="${output.file}" substring="FAILURES" />
</condition> </condition>
</fail> </fail>
<delete file="${archive.name}"/> <delete file="${archive.name}"/>
<delete file="${output.file}"/> <delete file="${output.file}"/>
</target> </target>
<target name="check-for-crash" if="has.crashed"> <target name="check-for-crash" if="has.crashed">
<exec executable="adb" outputproperty="arch"> <exec executable="adb" outputproperty="arch">
<arg value="shell"/> <arg value="shell"/>
<arg value="getprop" /> <arg value="getprop" />
<arg value="ro.product.cpu.abi"/> <arg value="ro.product.cpu.abi"/>
</exec> </exec>
<exec executable="bash" outputproperty="abi"> <exec executable="bash" outputproperty="abi">
<arg value="-c"/> <arg value="-c"/>
<arg value="echo ${arch} | tr -d '\r'"/> <arg value="echo ${arch} | tr -d '\r'"/>
</exec> </exec>
<exec executable="bash" > <exec executable="bash" >
<arg value="-c" /> <arg value="-c" />
<arg value="tail -n 500 ${archive.name}" /> <arg value="tail -n 500 ${archive.name}" />
</exec> </exec>
<exec executable="bash" > <exec executable="bash" >
<arg value="-c" /> <arg value="-c" />
<arg value="cat ${archive.name} |ndk-stack -sym ../libs-debug/${abi}" /> <arg value="cat ${archive.name} |ndk-stack -sym ../libs-debug/${abi}" />
</exec> </exec>
<fail message="Tests crashed" status="125"/> <fail message="Tests crashed" status="125"/>
</target> </target>

View file

@ -58,13 +58,22 @@
<delete file="${output.file}"/> <delete file="${output.file}"/>
</target> </target>
<target name="check-for-crash" if="has.crashed"> <target name="check-for-crash" if="has.crashed">
<exec executable="adb" outputproperty="arch">
<arg value="shell"/>
<arg value="getprop" />
<arg value="ro.product.cpu.abi"/>
</exec>
<exec executable="bash" outputproperty="abi">
<arg value="-c"/>
<arg value="echo ${arch} | tr -d '\r'"/>
</exec>
<exec executable="bash" > <exec executable="bash" >
<arg value="-c" /> <arg value="-c" />
<arg value="tail -n 500 ${archive.name}" /> <arg value="tail -n 500 ${archive.name}" />
</exec> </exec>
<exec executable="bash" > <exec executable="bash" >
<arg value="-c" /> <arg value="-c" />
<arg value="cat ${archive.name} |ndk-stack -sym obj/local/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" /> <arg value="cat ${archive.name} |ndk-stack -sym obj/local/${abi}" />
</exec> </exec>
<fail message="Tests crashed" status="125"/> <fail message="Tests crashed" status="125"/>
</target> </target>