use FDroid-standard naming when copying APKs for tests

This makes sure that there are no APKs with duplicate version codes.

diff --git a/tests/run-tests b/tests/run-tests
index 9b3b8ec0ed5e812748b9fc6d63deade7603f75b0..09e7c94b25dab2a2f591ebd0d946f9922916812d 100755 (executable)
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -7,12 +7,10 @@ copy_apks_into_repo() {
     for f in `ls -1 ../../*/bin/*.apk`; do
         name=$(basename $(dirname `dirname $f`))
         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"
-        cp $f $1/repo/$apk
+        cp -f $f $1/repo/$apk
     done
-    # delete any 'unaligned' duplicates
-    rm -f $1/repo/*unaligned*.apk
 }
 
 if [ -z $WORKSPACE ]; then