From 07836cf17ebb6ccb4fb4e263822ed73787cff1e6 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 7 Nov 2016 14:40:17 +0100
Subject: [PATCH] Fix custom_rules of tests

---
 liblinphone_tester/custom_rules.xml | 23 +++++++++++------------
 tests/custom_rules.xml              | 11 ++++++++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml
index 0bc993138..c39a5e851 100644
--- a/liblinphone_tester/custom_rules.xml
+++ b/liblinphone_tester/custom_rules.xml
@@ -62,27 +62,26 @@
 				<resourcecontains resource="${output.file}" substring="FAILURES" />
 			</condition>
 		</fail>
-
 		<delete file="${archive.name}"/>
 		<delete file="${output.file}"/>
 	</target>
 	<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="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" >
 			<arg value="-c" />
 			<arg value="tail -n 500 ${archive.name}" />
 		</exec>
 		<exec executable="bash" >
 			<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>
 		<fail message="Tests crashed" status="125"/>
 	</target>
diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml
index 5e7d620df..398c62ec7 100644
--- a/tests/custom_rules.xml
+++ b/tests/custom_rules.xml
@@ -58,13 +58,22 @@
 		<delete file="${output.file}"/>
 	</target>
 	<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" >
 			<arg value="-c" />
 			<arg value="tail -n 500 ${archive.name}" />
 		</exec>
 		<exec executable="bash" >
 			<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>
 		<fail message="Tests crashed" status="125"/>
 	</target>