maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing: separate distcheck 

"dist" must complete before being able to install and test packages on
different platforms. By running "make distcheck" separately, we can
start with parallel testing sooner and separately enable/disable
distcheck testing.
This commit is contained in:
Patrick Ohly 2014-01-17 05:51:32 -08:00
parent 333b282b9b
commit 70bca00073
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/resultchecker.py
View File

@ -151,11 +151,12 @@ def step1(resultdir, result, indents, dir, resulturi, shellprefix, srcdir):
result.write(indent+'''<prepare>\n''')
indent =indent+space
indents.append(indent)
tags=['libsynthesis', 'syncevolution', 'activesyncd', 'compile', 'dist']
tags=['libsynthesis', 'syncevolution', 'activesyncd', 'compile', 'dist', 'distcheck']
tagsp={'libsynthesis':'libsynthesis-source',
'syncevolution':'syncevolution-source',
'activesyncd':'activesyncd-source',
'compile':'compile',
'distcheck': 'distcheck',
'dist':'dist'}
for tag in tags:
result.write(indent+'''<'''+tagsp[tag])

25
test/runtests.py
View File

@ -1302,12 +1302,6 @@ class SyncEvolutionDist(AutotoolsBuild):
break
if self.binsuffix:
context.runCommand("%s %s BINSUFFIX=%s distbin" % (self.runner, context.make, self.binsuffix))
if enabled["dist"] == None:
context.runCommand("%s %s distcheck" % (self.runner, context.make))
context.runCommand("%s %s DISTCHECK_CONFIGURE_FLAGS=--enable-gui distcheck" % (self.runner, context.make))
context.runCommand("%s %s 'DISTCHECK_CONFIGURE_FLAGS=--disable-ecal --disable-ebook' distcheck" % (self.runner, context.make))
else:
context.runCommand("%s %s 'DISTCHECK_CONFIGURE_FLAGS=%s' distcheck" % (self.runner, context.make, enabled["dist"]))
dist = SyncEvolutionDist("dist",
options.binsuffix,
@ -1316,6 +1310,25 @@ dist = SyncEvolutionDist("dist",
[ compile.name ])
context.add(dist)
class SyncEvolutionDistcheck(AutotoolsBuild):
def __init__(self, name, binrunner, dependencies):
"""Does 'distcheck' in a directory where SyncEvolution was configured and compiled before."""
AutotoolsBuild.__init__(self, name, "", "", binrunner, dependencies)
def execute(self):
cd(self.builddir)
if enabled["distcheck"] == None:
context.runCommand("%s %s distcheck" % (self.runner, context.make))
context.runCommand("%s %s DISTCHECK_CONFIGURE_FLAGS=--enable-gui distcheck" % (self.runner, context.make))
context.runCommand("%s %s 'DISTCHECK_CONFIGURE_FLAGS=--disable-ecal --disable-ebook' distcheck" % (self.runner, context.make))
else:
context.runCommand("%s %s 'DISTCHECK_CONFIGURE_FLAGS=%s' distcheck" % (self.runner, context.make, enabled["dist"]))
distcheck = SyncEvolutionDistcheck("distcheck",
options.shell,
[ compile.name ])
context.add(distcheck)
evolutiontest = SyncEvolutionTest("evolution", compile,
"", options.shell,
"Client::Source SyncEvolution",