diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2006-12-18 20:33:56 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2006-12-18 20:33:56 +0000 |
commit | e6eb7b5307da2a446e1c8c6b0cb6b11fc6705b00 (patch) | |
tree | 3315ae510245c0a0b4d791b7c1d73f1bc01afdce /test/test-service.py | |
parent | 73457d0e435f4a9be9a9980fb06dd004b87c6647 (diff) |
Switch to autotools and test with Python 2.5 as well as 2.4.
In the process:
HACKING.txt: update
include/dbus-python.h: add some typedefs to make it saner
bus.c, conn.c, conn-methods.c: further alter docstrings to keep epydoc happy
exceptions.c: create exceptions in a more longwinded way for Python 2.5 compatibility
message-get-args.c, bus/__init__.py: tweak docstrings
dbus/introspect_parser.py: make docstring valid reStructuredText
run-test.sh: simplify, since configure now does some of the work
test/*.py: use paths from run-test.sh, cope with out-of-tree builds
test-standalone.py: carry out additional sanity checks
Diffstat (limited to 'test/test-service.py')
-rwxr-xr-x | test/test-service.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/test-service.py b/test/test-service.py index 6c1c043..f62e2fb 100755 --- a/test/test-service.py +++ b/test/test-service.py @@ -25,11 +25,8 @@ import sys import os import logging -builddir = os.environ["DBUS_TOP_BUILDDIR"] -pydir = builddir - -sys.path.insert(0, pydir) -sys.path.insert(0, pydir + 'dbus') +builddir = os.path.normpath(os.environ["DBUS_TOP_BUILDDIR"]) +pydir = os.path.normpath(os.environ["DBUS_TOP_SRCDIR"]) import dbus @@ -42,7 +39,7 @@ import gobject import random -logging.basicConfig(filename=pydir + '/test-service.log', filemode='w') +logging.basicConfig(filename=builddir + '/test/test-service.log', filemode='w') logging.getLogger().setLevel(1) logger = logging.getLogger('test-service') |