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

build: improve regsub pattern for setting buildToolsVersion

Browse source 
This addresses the discussion in !64
https://gitlab.com/fdroid/fdroidserver/merge_requests/64

Sometimes, buildToolsVersion is a kind of gradle macro call, and other
times it is a variable assignment.  This regsub pattern now handles both of
those cases.
This commit is contained in:
Hans-Christoph Steiner 2015-08-11 15:33:03 +02:00
parent 6db6433e97
commit d53a5af715
10 changed files with 717 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/build.TestCase
View file

@ -7,7 +7,9 @@ import inspect
import optparse
import os
import re
import shutil
import sys
import tempfile
import unittest
localmodule = os.path.realpath(
@ -46,13 +48,27 @@ class BuildTest(unittest.TestCase):
self.assertTrue(os.path.isfile(path))
def test_adapt_gradle(self):
testsbase = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
if not os.path.exists(testsbase):
os.makedirs(testsbase)
testsdir = tempfile.mkdtemp(prefix='test_adapt_gradle', dir=testsbase)
shutil.copytree(os.path.join(os.path.dirname(__file__), 'source-files'),
os.path.join(testsdir, 'source-files'))
teststring = 'FAKE_VERSION_FOR_TESTING'
fdroidserver.build.config = {}
fdroidserver.build.config['build_tools'] = teststring
fdroidserver.build.adapt_gradle(os.path.dirname(__file__))
filedata = open(os.path.join(os.path.dirname(__file__), 'build.gradle')).read()
self.assertIsNotNone(re.search("\s+buildToolsVersion = '%s'\s+" % teststring, filedata))
fdroidserver.build.adapt_gradle(testsdir)
pattern = re.compile("buildToolsVersion[\s=]+'%s'\s+" % teststring)
for f in ('source-files/fdroid/fdroidclient/build.gradle',
'source-files/Zillode/syncthing-silk/build.gradle',
'source-files/open-keychain/open-keychain/build.gradle',
'source-files/osmandapp/osmand/build.gradle'):
filedata = open(os.path.join(testsdir, f)).read()
self.assertIsNotNone(pattern.search(filedata))
tp = os.path.join(testsdir,
'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle')
filedata = open(tp).read()
self.assertIsNone(pattern.search(filedata))
if __name__ == "__main__":
parser = optparse.OptionParser()