summaryrefslogtreecommitdiffstats
path: root/test/name-test
diff options
context:
space:
mode:
Diffstat (limited to 'test/name-test')
-rw-r--r--test/name-test/Makefile.am2
-rwxr-xr-xtest/name-test/run-test.sh4
2 files changed, 2 insertions, 4 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 41bb24be..f4dc5343 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPIL
## 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=
diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index 81e2e84e..bad5ca2e 100755
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -8,8 +8,6 @@ ie()
fi
echo $SCRIPTNAME: $* >&2
- rm $DBUS_TOP_BUILDDIR/python/dbus
-
exit 1
}
@@ -24,7 +22,7 @@ export DBUS_TEST_NAME_RUN_TEST_SCRIPT=1
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"