From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 9 Nov 2017 13:07:28 +0000 (+0100)
Subject: tests: only test `fdroid build` if the right build-tools is installed
X-Git-Tag: 0.9~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cd3e763953670af538d1afb112669aef643fdc29;p=fdroidserver.git

tests: only test `fdroid build` if the right build-tools is installed
---

diff --git a/tests/run-tests b/tests/run-tests
index 54a418b3..696bcd75 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -184,7 +184,7 @@ git remote update -p
 git clean -fdx
 # stick with known working commit, in case future commits break things for this code
 git reset --hard fea54e1161d5eb9eb1a54e26253ef84d3ab63705
-if [ -d $ANDROID_HOME/platforms/android-23 ]; then
+if [ -d $ANDROID_HOME/platforms/android-23 && -d $ANDROID_HOME/build-tools/23.0.3 ]; then
     echo "build_tools = '`ls -1 $ANDROID_HOME/build-tools/ | sort -n | tail -1`'" > config.py
     echo "force_build_tools = True" >> config.py
     $fdroid build --verbose org.fdroid.ci.test.app:300