mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
fix tests

this fixes the copying of APKs in the test script
This commit is contained in:
Ciaran Gultnieks 2014-04-10 16:46:17 +00:00
commit c3a9b1b0c5
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MANIFEST.in
View file

@ -24,7 +24,7 @@ include docs/update.sh
include examples/config.py include examples/config.py
include examples/fdroid-icon.png include examples/fdroid-icon.png
include examples/makebs.config.py include examples/makebs.config.py
include tests/run-tests.sh include tests/run-tests
include wp-fdroid/AndroidManifest.xml include wp-fdroid/AndroidManifest.xml
include wp-fdroid/android-permissions.php include wp-fdroid/android-permissions.php
include wp-fdroid/readme.txt include wp-fdroid/readme.txt

4
jenkins-build
View file

@ -39,7 +39,7 @@ cd $WORKSPACE/fdroidserver/getsig
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# run local tests # run local tests
cd $WORKSPACE/tests cd $WORKSPACE/tests
./run-tests.sh ./run-tests
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
@ -59,7 +59,7 @@ python setup.py install
# run tests in new pip+virtualenv install # run tests in new pip+virtualenv install
. $WORKSPACE/env/bin/activate . $WORKSPACE/env/bin/activate
fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests.sh fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#

8
tests/run-tests.sh → tests/run-tests
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -e set -e
set -x set -x
@ -7,12 +7,10 @@ copy_apks_into_repo() {
for f in `ls -1 ../../*/bin/*.apk`; do for f in `ls -1 ../../*/bin/*.apk`; do
name=$(basename $(dirname `dirname $f`)) name=$(basename $(dirname `dirname $f`))
echo "name $name" echo "name $name"
apk=${name}_`basename $f` apk=`aapt d badging "$f" | sed -n "s,^package: name='\(.*\)' versionCode='\([0-9][0-9]*\)' .*,\1_\2.apk,p"`
echo "apk $apk" echo "apk $apk"
cp $f $1/repo/$apk cp -f $f $1/repo/$apk
done done
# delete any 'unaligned' duplicates
rm -f $1/repo/*unaligned*.apk
} }
if [ -z $WORKSPACE ]; then if [ -z $WORKSPACE ]; then