From d6bfbdd4a270a0b2421e8cba566805211b711c77 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 19 Dec 2006 15:16:43 +0000
Subject: [PATCH] Include the cross-test in 'make check'

---
 test/run-test.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/run-test.sh b/test/run-test.sh
index 6e31505..a7a43db 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -40,5 +40,35 @@ $PYTHON "$DBUS_TOP_SRCDIR"/test/test-client.py || die "test-client.py failed"
 echo "running test-signals.py"
 $PYTHON "$DBUS_TOP_SRCDIR"/test/test-signals.py || die "test-signals.py 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&
+sleep 1
+${MAKE:-make} -s cross-test-client > "$DBUS_TOP_BUILDDIR"/test/cross-client.log
+
+if grep . "$DBUS_TOP_BUILDDIR"/test/cross-client.log >/dev/null; then
+  :     # OK
+else
+  die "cross-test client produced no output"
+fi
+if grep . "$DBUS_TOP_BUILDDIR"/test/cross-server.log >/dev/null; then
+  :     # OK
+else
+  die "cross-test server produced no output"
+fi
+
+if grep fail "$DBUS_TOP_BUILDDIR"/test/cross-client.log; then
+  die "^^^ Cross-test client reports failures, see test/cross-client.log"
+else
+  echo "  - cross-test client reported no failures"
+fi
+if grep untested "$DBUS_TOP_BUILDDIR"/test/cross-server.log; then
+  die "^^^ Cross-test server reports incomplete test coverage"
+else
+  echo "  - cross-test server reported no untested functions"
+fi
+
 rm -f "$DBUS_TOP_BUILDDIR"/test/test-service.log
+rm -f "$DBUS_TOP_BUILDDIR"/test/cross-client.log
+rm -f "$DBUS_TOP_BUILDDIR"/test/cross-server.log
 exit 0
-- 
2.11.4.GIT