work on test prepare script, make the whole thing optional

This commit is contained in:
Vincent Breitmoser 2014-07-18 19:05:38 +02:00
parent 94e56a4542
commit 6d9eaaabb2
5 changed files with 34 additions and 17 deletions

3
.gitignore vendored
View File

@ -14,6 +14,9 @@ ant.properties
.gradle .gradle
build build
gradle.properties gradle.properties
# this is in here because the prepare-tests thing modifies it, and we DON'T
# want this to be commited. use git add -f to work on this file.
settings.gradle
#Maven #Maven
target target

View File

@ -12,7 +12,7 @@ before_install:
# Install required Android components. # Install required Android components.
#- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
- ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository
- ./install-custom-gradle-test-plugin.sh - ./prepare-tests.sh
install: echo "Installation done" install: echo "Installation done"
script: script:
- gradle assemble -S -q - gradle assemble -S -q

View File

@ -1,15 +0,0 @@
#!/bin/bash
mkdir temp
cd temp
git clone https://github.com/nenick/gradle-android-test-plugin.git
cd gradle-android-test-plugin
echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
echo "include ':gradle-android-test-plugin'" >> settings.gradle
./gradlew :gradle-android-test-plugin:install
cd ..
cd ..

30
prepare-tests.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/bash
# This script installs a plugin which is necessary to run OpenKeychain's tests
# into the local maven repository, then puts a line to include the -Test
# subproject into settings.gradle
echo "checking jdk runtime.."
if ! java -version 2>&1 | grep OpenJDK; then
echo "tests will only run on openjdk, see readme for details!" >&2
return
fi
tmpdir="$(mktemp -d)"
(
cd "$tmpdir";
git clone https://github.com/nenick/gradle-android-test-plugin.git
cd gradle-android-test-plugin
echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
echo "include ':gradle-android-test-plugin'" >> settings.gradle
./gradlew :gradle-android-test-plugin:install
)
rm -rf "$tmpdir"
echo -n "ok, adding tests to include list.. "
if grep OpenKeychain-Test settings.gradle >/dev/null ; then
echo " already in."
else
echo "include ':OpenKeychain-Test'" >> settings.gradle
echo "ok"
fi

View File

@ -1,5 +1,4 @@
include ':OpenKeychain' include ':OpenKeychain'
include ':OpenKeychain-Test'
include ':extern:openpgp-api-lib' include ':extern:openpgp-api-lib'
include ':extern:openkeychain-api-lib' include ':extern:openkeychain-api-lib'
include ':extern:html-textview' include ':extern:html-textview'