From 9871ad0f014eeb2d99d74ff1e3e24965ba7cc1b0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 13 Feb 2014 21:53:52 -0500 Subject: [PATCH] ant-prepare.sh: also set up test suite, should not affect normal ant builds This adds the command to update the embedded Android Test Project, so that it can be run using `cd test/; ant clean emma debug install test` It also changes -p to --path just to make things a little easier to read. --- ant-prepare.sh | 12 ++++++++---- test/ant.properties | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ant-prepare.sh b/ant-prepare.sh index 7817f4ed2..5463a67d5 100755 --- a/ant-prepare.sh +++ b/ant-prepare.sh @@ -1,6 +1,10 @@ #!/bin/bash -ex -android update lib-project -p extern/Universal-Image-Loader/library -android update lib-project -p extern/AndroidPinning -android update lib-project -p extern/MemorizingTrustManager -android update project -p . --name F-Droid +android update lib-project --path extern/Universal-Image-Loader/library +android update lib-project --path extern/AndroidPinning +android update lib-project --path extern/MemorizingTrustManager +android update project --path . --name F-Droid + +# technically optional, needed for the tests +cd test +android update test-project --path ./ --main ../ diff --git a/test/ant.properties b/test/ant.properties index 7d28fd099..836edf047 100644 --- a/test/ant.properties +++ b/test/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=/home/pete/code/fdroid/client +tested.project.dir=../