summaryrefslogtreecommitdiffstats
path: root/test/glib
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-03-17 17:48:29 +0000
committerColin Walters <walters@verbum.org>2005-03-17 17:48:29 +0000
commita65587676f6791ff6a7c9ed98bbc53d740f51fa8 (patch)
tree1e5fb5030cf55dc63dc388e6da4a7918dfa9251f /test/glib
parent6180ae6941aea083f5b8f3c4d3f16c928935bcaf (diff)
2005-03-17 Colin Walters <walters@verbum.org>
* bus/print-introspect.c: Move to tools/. * bus/run-with-tmp-session-bus.sh: Ditto. * glib/Makefile.am (dbus-glib-bindings.h): Move generation to tools/Makefile.am. * test/glib/run-test.sh: Update to handle move of run-with-tmp-session-bus.sh. * test/glib/test-service-glib.c: Update to handle move of dbus-glib-bindings.h. * tools/print-introspect.c: Moved here from bus/, and ported to GLib bindings. * tools/run-with-tmp-session-bus.sh: Moved here from bus/. * tools/Makefile.am: Generate dbus-glib-bindings.h and dbus-bus-introspect.xml here. * tools/.cvsignore, glib/.cvsignore, bus/.cvsignore: Update.
Diffstat (limited to 'test/glib')
-rwxr-xr-xtest/glib/run-test.sh2
-rw-r--r--test/glib/test-service-glib.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh
index 51d4a713..86f1aee8 100755
--- a/test/glib/run-test.sh
+++ b/test/glib/run-test.sh
@@ -10,7 +10,7 @@ export DBUS_TEST_GLIB_RUN_TEST_SCRIPT=1
if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
DBUS_TEST_GLIB_IN_RUN_TEST=1
export DBUS_TEST_GLIB_IN_RUN_TEST
- exec $DBUS_TOP_BUILDDIR/bus/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+ exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
fi
if test x$MODE = xprofile ; then
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c
index fef8a9da..d929999d 100644
--- a/test/glib/test-service-glib.c
+++ b/test/glib/test-service-glib.c
@@ -3,7 +3,7 @@
/* NOTE - outside of D-BUS core this would be
* include <dbus/dbus-glib-bindings.h>
*/
-#include "glib/dbus-glib-bindings.h"
+#include "tools/dbus-glib-bindings.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>