From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 7 Nov 2014 14:49:07 +0000 (+0000)
Subject: Merge branch 'some-bug-fixes' into 'master'
X-Git-Tag: 0.3.0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=2e56f4ecbfd34f1508c461e0633e8ca3cda9a88f

Merge branch 'some-bug-fixes' into 'master'

Some bug fixes and things

A couple of useful bug fixes and commits.

See merge request !28
---

2e56f4ecbfd34f1508c461e0633e8ca3cda9a88f
diff --cc jenkins-build
index 6e50b663,f67c5ed0..8a7ca9bd
--- a/jenkins-build
+++ b/jenkins-build
@@@ -38,11 -38,16 +38,11 @@@ f
  
  export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
  
 -#------------------------------------------------------------------------------#
 -# run local build
 -cd $WORKSPACE/fdroidserver/getsig
 -./make.sh
 -
  
  #------------------------------------------------------------------------------#
- # run local tests
+ # run local tests, don't scan fdroidserver/ project for APKs
  cd $WORKSPACE/tests
- ./run-tests ~jenkins/
+ ./run-tests ~jenkins/workspace/[[:upper:]a-eg-z]\*
  
  
  #------------------------------------------------------------------------------#