aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-11 19:58:28 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-11 19:58:28 +0200
commitd4fa2bbf47c2b2b722ecd2032e8479b405d65b59 (patch)
tree7436c86162076a7bb387176984b3ae5bf4a74493
parent74f510e62b22b22d3bab1d889c4ad55e2f479c6b (diff)
downloadopen-keychain-d4fa2bbf47c2b2b722ecd2032e8479b405d65b59.tar.gz
open-keychain-d4fa2bbf47c2b2b722ecd2032e8479b405d65b59.tar.bz2
open-keychain-d4fa2bbf47c2b2b722ecd2032e8479b405d65b59.zip
test: make testing optional in build
-rw-r--r--.travis.yml4
-rw-r--r--settings.gradle2
2 files changed, 3 insertions, 3 deletions
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
diff --git a/settings.gradle b/settings.gradle
index 86088e04a..47385ed14 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
include ':OpenKeychain'
-include ':OpenKeychain-Test'
+if (hasProperty('withTesting') && withTesting) include ':OpenKeychain-Test'
include ':extern:openpgp-api-lib'
include ':extern:openkeychain-api-lib'
include ':extern:html-textview'