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

testing: fixes for automatic integration

Browse source 
Some paths changed as part of the "automatic integrate" patch.
Instead of recalculating the path to the source code, use the
sync.basedir member.
(cherry picked from commit 4c5a27ce66)

Conflicts:

	test/runtests.py
This commit is contained in:
Patrick Ohly 2011-11-04 11:02:41 +01:00
parent 220d60caae
commit 86cc5f5785
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/runtests.py
View file

@ -546,13 +546,16 @@ class SyncEvolutionTest(Action):
if not os.access(backenddir, os.F_OK):
# fallback: relative to client-test inside the current directory
backenddir = "backends"
# same with configs and templates, except that they use the source as fallback
confdir = os.path.join(compile.installdir, "usr/lib/syncevolution/xml")
if not os.access(confdir, os.F_OK):
confdir = os.path.join(context.workdir, "syncevolution/src/syncevo/configs")
confdir = os.path.join(sync.basedir, "src/syncevo/configs")
templatedir = os.path.join(compile.installdir, "usr/lib/syncevolution/templates")
if not os.access(templatedir, os.F_OK):
templatedir = os.path.join(context.workdir, "syncevolution/src/templates")
templatedir = os.path.join(sync.basedir, "src/templates")
installenv = \
"SYNCEVOLUTION_TEMPLATE_DIR=%s " \
"SYNCEVOLUTION_XML_CONFIG_DIR=%s " \
@ -924,8 +927,7 @@ dbustest = SyncEvolutionTest("dbus", compile,
"",
[],
testPrefix=testprefix,
testBinary=os.path.join(abspath(context.workdir),
"syncevolution",
testBinary=os.path.join(sync.basedir,
"test",
"test-dbus.py -v"))
context.add(dbustest)