From 8d37fc2a9451881ccb86a3e8aa133473fc1dcee0 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 2 Jun 2009 17:33:36 +0000
Subject: Add "clean" and "tests" ant tasks into build.xml

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@262 df292f66-193f-0410-a5fc-6d59da041ff2
---
 build.xml       | 35 +++++++++++++++++++++++++++++++++++
 tests/build.xml |  6 ++++++
 2 files changed, 41 insertions(+)

diff --git a/build.xml b/build.xml
index 860f671..0f9c5dc 100644
--- a/build.xml
+++ b/build.xml
@@ -303,4 +303,39 @@
 
         <echo>Updated "msg_version" to: ${ant.project.name} ${manifest.android:versionName} (r${Revision} ${build.date})</echo>
     </target>
+
+    <target name="clean"
+        description="Clean up the result of the build process">
+        <delete dir="${out-folder}"/>
+        <delete dir="${gen-folder}"/>
+        <exec executable="ant" failonerror="true">
+            <arg value="-f" />
+            <arg value="tests/build.xml" />
+            <arg value="clean"/>
+        </exec>
+    </target>
+
+    <target name="tests" depends="reinstall">
+        <echo>Building and installing tests...</echo>
+        <exec executable="ant" failonerror="true">
+            <arg value="-f" />
+            <arg value="tests/build.xml" />
+            <arg value="reinstall"/>
+        </exec>
+        <!-- <mkdir dir="${log-dir}" /> -->
+	<echo>Running test cases...</echo>
+        <exec executable="${adb}">
+            <arg value="shell" />
+            <arg value="am" />
+            <arg value="instrument" />
+            <arg value="-w" />
+            <arg value="${application-package}.tests/android.test.InstrumentationTestRunner" />
+            <redirector outputproperty="test.results"/>
+        </exec>
+        <fail message="Some unit tests failed:${line.separator}${test.results}">
+            <condition>
+                <contains string="${test.results}" substring="FAILURES"/>
+            </condition>
+        </fail>
+    </target>
 </project>
diff --git a/tests/build.xml b/tests/build.xml
index 1998d9c..cbce2d7 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -58,4 +58,10 @@
          targets are used.
     -->
     <setup />
+
+    <target name="clean"
+        description="Clean up the result of the build process">
+        <delete dir="${out-folder}"/>
+        <delete dir="${gen-folder}"/>
+    </target>
 </project>
-- 
cgit v1.2.3