mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: fix --android-home test to actually work

Browse source 
In this case, ANDROID_HOME is set to a fake, non-working version that will
be detected by fdroid as an Android SDK install.  It should use the path
set by --android-home over the one in ANDROID_HOME, therefore if it uses
the one in ANDROID_HOME, it won't work because it is a fake one.  Only
--android-home provides a working one.
This commit is contained in:
Hans-Christoph Steiner 2014-06-04 18:45:06 -04:00
parent 479e194976
commit 0272124248
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/run-tests
View file

@ -138,6 +138,11 @@ set -e
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# In this case, ANDROID_HOME is set to a fake, non-working version that will
# be detected by fdroid as an Android SDK install. It should use the path set
# by --android-home over the one in ANDROID_HOME, therefore if it uses the one
# in ANDROID_HOME, it won't work because it is a fake one. Only
# --android-home provides a working one.
echo_header "setup a new repo from scratch with keystore and android-home set on cmd line" echo_header "setup a new repo from scratch with keystore and android-home set on cmd line"
REPOROOT=`create_test_dir` REPOROOT=`create_test_dir`
@ -148,7 +153,7 @@ STORED_ANDROID_HOME=$ANDROID_HOME
unset ANDROID_HOME unset ANDROID_HOME
echo "ANDROID_HOME: $ANDROID_HOME" echo "ANDROID_HOME: $ANDROID_HOME"
cd $REPOROOT cd $REPOROOT
$fdroid init --keystore $KEYSTORE --android-home $FAKE_ANDROID_HOME --no-prompt $fdroid init --keystore $KEYSTORE --android-home $STORED_ANDROID_HOME --no-prompt
test -e $KEYSTORE test -e $KEYSTORE
copy_apks_into_repo $REPOROOT copy_apks_into_repo $REPOROOT
$fdroid update --create-metadata $fdroid update --create-metadata