diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2016-11-04 03:07:09 -0700 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2016-11-04 03:07:09 -0700 |
| commit | e844f43a4f18f355aabdd0dbf2d6d9c2a385a6ea (patch) | |
| tree | 95aeee06f5440893f632a4bddcef1b89ebc8a8a6 | |
| parent | 451440bd549de11dee2d7c7f4407a97cc029aa49 (diff) | |
runtests.py: uninstalled activesyncd + glib schemas
The more recent activesyncd uses GSetting schema files. We
need to set an env variable if they are nor installed in the
default system location.
| -rwxr-xr-x | test/runtests.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/runtests.py b/test/runtests.py index 62aaa535..4d1d0c8f 100755 --- a/test/runtests.py +++ b/test/runtests.py @@ -1827,8 +1827,10 @@ class ActiveSyncTest(SyncEvolutionTest): # created during compile. We have to predict the location here. if compile.installed: self.activesyncd = os.path.join(compile.installdir, "usr", "libexec", "activesyncd") + self.activesyncd_schema_dir = "" else: self.activesyncd = os.path.join(compile.builddir, "src", "backends", "activesync", "activesyncd", "install", "libexec", "activesyncd") + self.activesyncd_schema_dir = os.path.join(compile.builddir, "src", "backends", "activesync", "activesyncd", "install", "share", "glib-2.0", "schemas") SyncEvolutionTest.__init__(self, name, compile, @@ -1866,7 +1868,8 @@ class ActiveSyncTest(SyncEvolutionTest): "CLIENT_TEST_LOG=activesyncd.log " , - testPrefix=" ".join(("env EAS_DEBUG_FILE=activesyncd.log", + testPrefix=" ".join(("env EAS_DEBUG_FILE=activesyncd.log" + \ + ((" GSETTINGS_SCHEMA_DIR=%s" % self.activesyncd_schema_dir) if self.activesyncd_schema_dir else ""), os.path.join(sync.basedir, "test", "wrappercheck.sh"), options.testprefix, self.activesyncd, @@ -1883,6 +1886,8 @@ class ActiveSyncTest(SyncEvolutionTest): env['EAS_SOUP_LOGGER'] = '1' env['EAS_DEBUG'] = '5' env['EAS_DEBUG_DETACHED_RECURRENCES'] = '1' + if self.activesyncd_schema_dir: + env['GSETTINGS_SCHEMA_DIR'] = self.activesyncd_schema_dir activesyncd = subprocess.Popen(args, env=env) try: |