summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcompile.sh2
-rw-r--r--tests/ant.properties2
-rw-r--r--tests/build.xml92
-rwxr-xr-xtests/compile.sh1
-rw-r--r--tests/project.properties2
-rwxr-xr-xtests/run.sh2
6 files changed, 99 insertions, 2 deletions
diff --git a/compile.sh b/compile.sh
index c557e371..32d36267 100755
--- a/compile.sh
+++ b/compile.sh
@@ -9,3 +9,5 @@ fi
android update project --path . --name "Bitmask for Android" --target android-17
ant debug
+
+cd tests/ && ./compile.sh && cd ..
diff --git a/tests/ant.properties b/tests/ant.properties
index a9718c82..16244024 100644
--- a/tests/ant.properties
+++ b/tests/ant.properties
@@ -15,4 +15,4 @@
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.
-tested.project.dir=/media/Datos/workspace/leap_android
+tested.project.dir=..
diff --git a/tests/build.xml b/tests/build.xml
new file mode 100644
index 00000000..7da0cf51
--- /dev/null
+++ b/tests/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Bitmask_for_Android_tests" default="help">
+
+ <!-- The local.properties file is created and updated by the 'android' tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The ant.properties file can be created by you. It is only edited by the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="ant.properties" />
+
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
+ <!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and library
+ dependencies. Lower level build properties are stored in ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <loadproperties srcFile="project.properties" />
+
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+ unless="sdk.dir"
+ />
+
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
+
+ <!-- Import the actual build file.
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <import> task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the <import> task.
+ - customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
+ -->
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/tests/compile.sh b/tests/compile.sh
new file mode 100755
index 00000000..a6d3534a
--- /dev/null
+++ b/tests/compile.sh
@@ -0,0 +1 @@
+android update test-project -m .. -p .
diff --git a/tests/project.properties b/tests/project.properties
index 0840b4a0..a3ee5ab6 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-15
+target=android-17
diff --git a/tests/run.sh b/tests/run.sh
new file mode 100755
index 00000000..7705cd8f
--- /dev/null
+++ b/tests/run.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+ant test