From 18170dd986e4e4efe440c9dfa6f47ba87604b7ec Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 26 Aug 2005 04:23:33 +0000 Subject: * s/Message(_create=0)/EmptyMessage everywhere else * test/python/test-{server|client}.py: add the python/.libs directory to the lookup path so dbus_bindings and dbus_glib_bindings don't get picked up from the system --- test/python/run-test.sh | 2 +- test/python/test-client.py | 2 ++ test/python/test-service.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/python/run-test.sh b/test/python/run-test.sh index f7e067aa..600eb6d7 100755 --- a/test/python/run-test.sh +++ b/test/python/run-test.sh @@ -29,6 +29,6 @@ fi ln -s $DBUS_TOP_BUILDDIR/python $DBUS_TOP_BUILDDIR/python/dbus echo "running test-client.py" -$DBUS_TOP_BUILDDIR/test/python/test-client.py || die "test-client.py failed" +libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/python/test-client.py || die "test-client.py failed" rm $DBUS_TOP_BUILDDIR/python/dbus diff --git a/test/python/test-client.py b/test/python/test-client.py index f9f692c2..51d655db 100755 --- a/test/python/test-client.py +++ b/test/python/test-client.py @@ -6,8 +6,10 @@ builddir = os.environ["DBUS_TOP_BUILDDIR"] pydir = builddir + "/python" sys.path.insert(0, pydir) +sys.path.insert(0, pydir + "/.libs") import dbus +import dbus_bindings if not dbus.__file__.startswith(pydir): raise Exception("DBus modules are not being picked up from the package") diff --git a/test/python/test-service.py b/test/python/test-service.py index 21d101ce..8f3cb7af 100755 --- a/test/python/test-service.py +++ b/test/python/test-service.py @@ -6,6 +6,7 @@ builddir = os.environ["DBUS_TOP_BUILDDIR"] pydir = builddir + "/python" sys.path.insert(0, pydir) +sys.path.insert(0, pydir + '/.libs') import dbus @@ -29,6 +30,5 @@ class TestObject(dbus.service.Object): session_bus = dbus.SessionBus() name = dbus.service.BusName("org.freedesktop.DBus.TestSuitePythonService", bus=session_bus) object = TestObject(name) - loop = gobject.MainLoop() loop.run() -- cgit