dbus/test/glib test-service-glib.c,1.10,1.11 run-test.sh,1.9,1.10

[Colin Walters]

Update of /cvs/dbus/dbus/test/glib
In directory gabe:/tmp/cvs-serv31306/test/glib

Modified Files:
	test-service-glib.c run-test.sh 
Log Message:
2005-03-17  Colin Walters  <walters at 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.


Index: test-service-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-service-glib.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test-service-glib.c	17 Mar 2005 17:11:59 -0000	1.10
+++ test-service-glib.c	17 Mar 2005 17:48:29 -0000	1.11
@@ -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>

Index: run-test.sh
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/run-test.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- run-test.sh	12 Mar 2005 16:33:00 -0000	1.9
+++ run-test.sh	17 Mar 2005 17:48:29 -0000	1.10
@@ -10,7 +10,7 @@
 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