dbus/test/name-test Makefile.am,1.3,1.4 run-test.sh,1.4,1.5

[John Palmieri]

Update of /cvs/dbus/dbus/test/name-test
In directory kemper:/tmp/cvs-serv26577/test/name-test

Modified Files:
	Makefile.am run-test.sh 
Log Message:
* configure.in, dbus/Makefile.am, test/name-test/run-test.sh, 
  test/name-test/Makefile.am: Fixed some issues with getting get dbus 
  to build with builddir != srcdir (Taken from a patch by Bernard Leak
  <bernard at brenda-arkle dot demon dot co dot uk>)


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/name-test/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	16 Aug 2006 22:30:15 -0000	1.3
+++ Makefile.am	25 Aug 2006 19:50:16 -0000	1.4
@@ -4,7 +4,7 @@
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 TESTS=run-test.sh
 else
 TESTS=

Index: run-test.sh
===================================================================
RCS file: /cvs/dbus/dbus/test/name-test/run-test.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- run-test.sh	16 Aug 2006 22:30:15 -0000	1.4
+++ run-test.sh	25 Aug 2006 19:50:16 -0000	1.5
@@ -8,8 +8,6 @@
     fi
     echo $SCRIPTNAME: $* >&2
 
-    rm $DBUS_TOP_BUILDDIR/python/dbus
- 
     exit 1
 }
 
@@ -24,7 +22,7 @@
 if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
   DBUS_TEST_NAME_IN_RUN_TEST=1
   export DBUS_TEST_NAME_IN_RUN_TEST
-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
 fi 
 echo "running test-names"
 libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-client failed"