testing: fixes for automatic integration
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:
parent
220d60caae
commit
86cc5f5785
1 changed files with 6 additions and 4 deletions
|
@ -546,13 +546,16 @@ class SyncEvolutionTest(Action):
|
||||||
if not os.access(backenddir, os.F_OK):
|
if not os.access(backenddir, os.F_OK):
|
||||||
# fallback: relative to client-test inside the current directory
|
# fallback: relative to client-test inside the current directory
|
||||||
backenddir = "backends"
|
backenddir = "backends"
|
||||||
|
|
||||||
# same with configs and templates, except that they use the source as fallback
|
# same with configs and templates, except that they use the source as fallback
|
||||||
confdir = os.path.join(compile.installdir, "usr/lib/syncevolution/xml")
|
confdir = os.path.join(compile.installdir, "usr/lib/syncevolution/xml")
|
||||||
if not os.access(confdir, os.F_OK):
|
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")
|
templatedir = os.path.join(compile.installdir, "usr/lib/syncevolution/templates")
|
||||||
if not os.access(templatedir, os.F_OK):
|
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 = \
|
installenv = \
|
||||||
"SYNCEVOLUTION_TEMPLATE_DIR=%s " \
|
"SYNCEVOLUTION_TEMPLATE_DIR=%s " \
|
||||||
"SYNCEVOLUTION_XML_CONFIG_DIR=%s " \
|
"SYNCEVOLUTION_XML_CONFIG_DIR=%s " \
|
||||||
|
@ -924,8 +927,7 @@ dbustest = SyncEvolutionTest("dbus", compile,
|
||||||
"",
|
"",
|
||||||
[],
|
[],
|
||||||
testPrefix=testprefix,
|
testPrefix=testprefix,
|
||||||
testBinary=os.path.join(abspath(context.workdir),
|
testBinary=os.path.join(sync.basedir,
|
||||||
"syncevolution",
|
|
||||||
"test",
|
"test",
|
||||||
"test-dbus.py -v"))
|
"test-dbus.py -v"))
|
||||||
context.add(dbustest)
|
context.add(dbustest)
|
||||||
|
|
Loading…
Reference in a new issue