From cb82f2205683fe2a532f3ed9d91be3c24c1f2b4a Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 11 Aug 2011 12:23:23 +0200 Subject: [PATCH] gibber: Remove broken tests and dependency on xmldiff * These tests don't run successfully anyway. https://bugs.freedesktop.org/show_bug.cgi?id=40001 --- configure.ac | 8 ----- lib/gibber/tests/Makefile.am | 2 - lib/gibber/tests/inputs/Makefile.am | 5 --- lib/gibber/tests/inputs/groupchat-invite.input | 32 -------------------- .../inputs/simple-message-attrnamespace.input | 17 ---------- lib/gibber/tests/inputs/simple-message.input | 16 ---------- .../tests/inputs/strange-streamopening.input | 9 ----- lib/gibber/tests/inputs/tls-stream-start.input | 18 ----------- lib/gibber/tests/run-xmpp-connection-test.sh | 29 ------------------ 9 files changed, 0 insertions(+), 136 deletions(-) delete mode 100644 lib/gibber/tests/inputs/Makefile.am delete mode 100644 lib/gibber/tests/inputs/groupchat-invite.input delete mode 100644 lib/gibber/tests/inputs/simple-message-attrnamespace.input delete mode 100644 lib/gibber/tests/inputs/simple-message.input delete mode 100644 lib/gibber/tests/inputs/strange-streamopening.input delete mode 100644 lib/gibber/tests/inputs/tls-stream-start.input delete mode 100755 lib/gibber/tests/run-xmpp-connection-test.sh diff --git a/configure.ac b/configure.ac index 14676dc..870eeff 100644 --- a/configure.ac +++ b/configure.ac @@ -87,13 +87,6 @@ if test -z "$XSLTPROC"; then AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) fi -dnl check for xmldiff -XMLDIFF= -AC_CHECK_PROGS([XMLDIFF], [xmldiff]) -if test -z "$XMLDIFF"; then - AC_MSG_ERROR([xmldiff is required for the gibber tests]) -fi - AM_PATH_PYTHON([2.5]) # Check for a python >= 2.5 with twisted to run python tests @@ -282,7 +275,6 @@ AC_OUTPUT( Makefile \ lib/ext/Makefile \ lib/gibber/Makefile \ lib/gibber/tests/Makefile \ - lib/gibber/tests/inputs/Makefile \ src/Makefile \ m4/Makefile \ data/Makefile \ diff --git a/lib/gibber/tests/Makefile.am b/lib/gibber/tests/Makefile.am index 8fe6e19..e602566 100644 --- a/lib/gibber/tests/Makefile.am +++ b/lib/gibber/tests/Makefile.am @@ -15,8 +15,6 @@ AM_LDFLAGS = @GLIB_LIBS@ \ clean-local: -rm -rf outputs -SUBDIRS = inputs - EXTRA_DIST = \ test-transport.h \ test-transport.c diff --git a/lib/gibber/tests/inputs/Makefile.am b/lib/gibber/tests/inputs/Makefile.am deleted file mode 100644 index 0b8b19f..0000000 --- a/lib/gibber/tests/inputs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = \ - groupchat-invite.input \ - simple-message-attrnamespace.input \ - simple-message.input \ - strange-streamopening.input diff --git a/lib/gibber/tests/inputs/groupchat-invite.input b/lib/gibber/tests/inputs/groupchat-invite.input deleted file mode 100644 index 3c7954f..0000000 --- a/lib/gibber/tests/inputs/groupchat-invite.input +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Hey Hecate, this is the place for all good witches! - - - - - - - You have been invited to darkcave@macbeth by crone1@shakespeare.lit. - - - - Hey Hecate, this is the place for all good witches! - - - cauldronburn - - - - - diff --git a/lib/gibber/tests/inputs/simple-message-attrnamespace.input b/lib/gibber/tests/inputs/simple-message-attrnamespace.input deleted file mode 100644 index b85d92f..0000000 --- a/lib/gibber/tests/inputs/simple-message-attrnamespace.input +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Art thou not Romeo, and a Montague? - - - - Neither, fair saint, if either thee dislike. - - - diff --git a/lib/gibber/tests/inputs/simple-message.input b/lib/gibber/tests/inputs/simple-message.input deleted file mode 100644 index a3989ae..0000000 --- a/lib/gibber/tests/inputs/simple-message.input +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Art thou not Romeo, and a Montague? - - - - Neither, fair saint, if either thee dislike. - - - diff --git a/lib/gibber/tests/inputs/strange-streamopening.input b/lib/gibber/tests/inputs/strange-streamopening.input deleted file mode 100644 index 4685541..0000000 --- a/lib/gibber/tests/inputs/strange-streamopening.input +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/lib/gibber/tests/inputs/tls-stream-start.input b/lib/gibber/tests/inputs/tls-stream-start.input deleted file mode 100644 index d30bcf8..0000000 --- a/lib/gibber/tests/inputs/tls-stream-start.input +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - DIGEST-MD5 - PLAIN - - - - - diff --git a/lib/gibber/tests/run-xmpp-connection-test.sh b/lib/gibber/tests/run-xmpp-connection-test.sh deleted file mode 100755 index e2337ab..0000000 --- a/lib/gibber/tests/run-xmpp-connection-test.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -mkdir -p outputs - -RET=0 - - -srcdir=${srdir:=$(dirname $0)} - -for x in ${srcdir}/inputs/*.input ; do - FILE=$(basename ${x%.input}) - XMLOUT="outputs/${FILE}.output" - PARSEOUT="outputs/${FILE}.parse" - ./test-xmpp-connection $x ${PARSEOUT} ${XMLOUT} - if [ $? -ne 0 ] ; then - echo "FAILED: $x - Test program had non-zero exit status" >&2 - RET=1 - continue - fi - xmldiff $x $XMLOUT - if [ $? -ne 0 ] ; then - echo "FAILED: $x - XML output doesn't match the input" >&2 - RET=1 - continue - fi - echo "SUCCESS: $x" >&2 -done - -exit ${RET} -- 1.7.6