chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a141249
)
tests: only test `fdroid build` if the right build-tools is installed
author
Hans-Christoph Steiner
<hans@eds.org>
Thu, 9 Nov 2017 13:07:28 +0000
(14:07 +0100)
committer
Hans-Christoph Steiner
<hans@eds.org>
Thu, 9 Nov 2017 13:07:40 +0000
(14:07 +0100)
tests/run-tests
patch
|
blob
|
history
diff --git
a/tests/run-tests
b/tests/run-tests
index 54a418b39f8072a8c4963f23624627bccdbe6a3c..696bcd75eaaba7ef05657e7ffad0d2cf3a0508da 100755
(executable)
--- 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
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
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