summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-07-04 20:27:12 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-07-04 20:27:12 +0100
commit9c02d05642c8f99e3fe61804bcc33df380ebd5b1 (patch)
treeea78ee4df31a98174251cf73079be303df714437
parente8a507570e12778a0f325786fcf9f5f768019118 (diff)
downloaddbus-python-9c02d05642c8f99e3fe61804bcc33df380ebd5b1.tar.gz
run-test.sh: don't go via make to run the cross-test
Based on a patch from Christoph Höger. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51725
-rwxr-xr-xtest/run-test.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/run-test.sh b/test/run-test.sh
index 79efaff..5648179 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -88,9 +88,9 @@ $PYTHON "$DBUS_TOP_SRCDIR"/test/test-unusable-main-loop.py || die "... failed"
echo "running cross-test (for better diagnostics use mjj29's dbus-test)"
-${MAKE:-make} -s cross-test-server > "$DBUS_TOP_BUILDDIR"/test/cross-server.log&
+$PYTHON "$DBUS_TOP_SRCDIR"/test/cross-test-server.py > "$DBUS_TOP_BUILDDIR"/test/cross-server.log&
sleep 1
-${MAKE:-make} -s cross-test-client > "$DBUS_TOP_BUILDDIR"/test/cross-client.log
+$PYTHON "$DBUS_TOP_SRCDIR"/test/cross-test-client.py > "$DBUS_TOP_BUILDDIR"/test/cross-client.log
if grep . "$DBUS_TOP_BUILDDIR"/test/cross-client.log >/dev/null; then
: # OK