Replace getsig.java with a pure python implementation

[fdroidserver.git] / tests / run-tests

diff --git a/tests/run-tests b/tests/run-tests
index a3b5e76b20a7a1e64b958c4371020f7df0fd78ef..1f0e7709e7355f770f496577fb7678403d44e527 100755 (executable)
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -23,10 +23,14 @@ copy_apks_into_repo() {
     set -x
 }
 
+# keep this as an old version to test the automatic parsing of build-tools
+# verion numbers in `fdroid init`
 create_fake_android_home() {
+    mkdir $1/tools
+    mkdir $1/platform-tools
     mkdir $1/build-tools
-    mkdir $1/build-tools/19.1.0
-    touch $1/build-tools/19.1.0/aapt
+    mkdir $1/build-tools/19.0.2
+    touch $1/build-tools/19.0.2/aapt
 }
 
 create_test_dir() {
@@ -75,18 +79,28 @@ if [ -z $aapt ]; then
     aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt | sort | tail -1`
 fi
 
+# allow the location of python to be overridden
+if [ -z $python ]; then
+    python=python2
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header "run commit hooks"
+
+cd $WORKSPACE
+./hooks/pre-commit
+
 
 #------------------------------------------------------------------------------#
 echo_header "create a source tarball and use that to build a repo"
 
 cd $WORKSPACE
-python setup.py sdist
+$python setup.py sdist
 
 REPOROOT=`create_test_dir`
 cd $REPOROOT
 tar xzf `ls -1 $WORKSPACE/dist/fdroidserver-*.tar.gz | sort -n | tail -1`
-cd $REPOROOT/fdroidserver-*/fdroidserver/getsig
-./make.sh
 cd $REPOROOT
 ./fdroidserver-*/fdroid init
 copy_apks_into_repo $REPOROOT
@@ -172,7 +186,7 @@ set -e
 
 
 #------------------------------------------------------------------------------#
-echo_header "check that fake android home passes `fdroid init`"
+echo_header "check that fake android home passes 'fdroid init'"
 
 REPOROOT=`create_test_dir`
 FAKE_ANDROID_HOME=`create_test_dir`
@@ -297,5 +311,6 @@ $fdroid init --keystore NONE
 test -e opensc-fdroid.cfg
 test ! -e NONE
 
+rm -rf $WORKSPACE/fdroidserver.egg-info/
 
 echo SUCCESS