From 718acbf954b1318c6a90ba0f9c79e63f398fb498 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 9 Jul 2014 15:53:18 +0200 Subject: put unit tests into external module (CAVEAT) this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 5da831e61..2e86699f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: # 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 - ( 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 install: echo "Installation done" script: gradle assemble -S -q -- cgit v1.2.3 From a99589e9c4f7ff484705a895fa4168b31dcbfe33 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 9 Jul 2014 17:41:13 +0200 Subject: use openjdk7 in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2e86699f3..63a9906b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -jdk: oraclejdk7 +jdk: openjdk7 before_install: # Install base Android SDK - sudo apt-get update -qq -- cgit v1.2.3 From 6f0e3c242a904d55db27adc5448b28ad34f973cb Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Jul 2014 01:56:21 +0200 Subject: test: enable travis, disable dysfunctional tests to make it work --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 63a9906b7..c580122fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ before_install: - ( 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 install: echo "Installation done" -script: gradle assemble -S -q +script: gradle assemble OpenKeychain-Test:testDebug -S -q -- cgit v1.2.3 From 7532baa6c7614d526d508f37c323e24edd788771 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Jul 2014 02:08:23 +0200 Subject: test: add --info to travis thing, for testing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c580122fb..2d1d8b4a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ before_install: - ( 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 install: echo "Installation done" -script: gradle assemble OpenKeychain-Test:testDebug -S -q +script: gradle assemble OpenKeychain-Test:testDebug -S -q --info -- cgit v1.2.3 From 0e7d4f644bafd4133fa8daaf8fb24cb5012fd42e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Jul 2014 02:18:35 +0200 Subject: Revert "test: add --info to travis thing, for testing" This reverts commit 7532baa6c7614d526d508f37c323e24edd788771. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2d1d8b4a6..c580122fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ before_install: - ( 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 install: echo "Installation done" -script: gradle assemble OpenKeychain-Test:testDebug -S -q --info +script: gradle assemble OpenKeychain-Test:testDebug -S -q -- cgit v1.2.3 From 65e75eed930a4b873ef53f55f3fde5e649188543 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 11 Jul 2014 16:51:10 +0200 Subject: travis: try running tests separately with info output --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c580122fb..fd6e55ea7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,7 @@ before_install: - ( 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 install: echo "Installation done" -script: gradle assemble OpenKeychain-Test:testDebug -S -q +script: + - gradle assemble -S -q + - gradle --info OpenKeychain-Test:testDebug -- cgit v1.2.3 From d4fa2bbf47c2b2b722ecd2032e8479b405d65b59 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 11 Jul 2014 19:58:28 +0200 Subject: test: make testing optional in build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index fd6e55ea7..673dd3876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ before_install: - ./install-custom-gradle-test-plugin.sh install: echo "Installation done" script: - - gradle assemble -S -q - - gradle --info OpenKeychain-Test:testDebug + - gradle -PwithTesting=true assemble -S -q + - gradle -PwithTesting=true --info OpenKeychain-Test:testDebug -- cgit v1.2.3 From d4c1b781db6198fc8a99b29173d872d418032a67 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 12 Jul 2014 01:28:27 +0200 Subject: test: add algorithm choice tests --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 673dd3876..fd6e55ea7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ before_install: - ./install-custom-gradle-test-plugin.sh install: echo "Installation done" script: - - gradle -PwithTesting=true assemble -S -q - - gradle -PwithTesting=true --info OpenKeychain-Test:testDebug + - gradle assemble -S -q + - gradle --info OpenKeychain-Test:testDebug -- cgit v1.2.3 From 6d9eaaabb211d538866edfa362c7a4abea05a962 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 18 Jul 2014 19:05:38 +0200 Subject: work on test prepare script, make the whole thing optional --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index fd6e55ea7..ef69eb556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: # 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 - ( 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" script: - gradle assemble -S -q -- cgit v1.2.3