diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2013-03-04 07:27:44 -0800 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2013-03-04 07:36:22 -0800 |
| commit | 1995bd618483306f418233c74c14160495a6f803 (patch) | |
| tree | b42e816f898ff0866483c985ce1300074ad498a1 | |
| parent | f5286a09fa21f380a251c8d0f80576830348fa5f (diff) | |
D-Bus testing: fix auto start test when using jhbuild
The test must not overwrite XDG_DATA_DIRS, because jhbuild sets
essential values there. Instead append.
| -rwxr-xr-x | test/test-dbus.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-dbus.py b/test/test-dbus.py index 29c04092..bbd96364 100755 --- a/test/test-dbus.py +++ b/test/test-dbus.py @@ -1439,7 +1439,7 @@ Exec=%s # that syncevo-dbus-server. Uses a dbus-session.sh from the # same dir as test-dbus.py itself. env = copy.deepcopy(os.environ) - env['XDG_DATA_DIRS'] = os.path.abspath(os.path.join(xdg_root, "share")) + env['XDG_DATA_DIRS'] = env.get('XDG_DATA_DIRS', '') + ':' + os.path.abspath(os.path.join(xdg_root, "share")) # Avoid running EDS and Akonadi. They are not needed for this test # and can cause false failures, for example when the daemons |