[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-testing

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    added tests/twisted/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix up invocation of Twisted tests

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Knock out vCard torture test

  Senko Rasic <senko.rasic at collabora.co.uk>
    test code reorganization, step 2: modify makefiles to reflect the new directory structure

  Senko Rasic <senko.rasic at collabora.co.uk>
    fixes in configure.ac and Makefile.am's related to twisted tests

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/jingle/test-incoming-call.py: disable, not reliable

  Senko Rasic <senko.rasic at collabora.co.uk>
    twisted tests are executed in make check only if twisted support is found on the system

  Senko Rasic <senko.rasic at collabora.co.uk>
    when doing twisted checks, use tools from tools/ subdirectory

  Senko Rasic <senko.rasic at collabora.co.uk>
    fixed typo

  Senko Rasic <senko.rasic at collabora.co.uk>
    copied with-session-bus.sh from telepathy-glib sources

  Senko Rasic <senko.rasic at collabora.co.uk>
    moved utilities for running twisted tests to tests/twisted/tools

  Senko Rasic <senko.rasic at collabora.co.uk>
    improved autoconf-fu for twisted tests

  Senko Rasic <senko.rasic at collabora.co.uk>
    rearranged coding style check injection and fixed typo in exec-with-log.sh.in

  Senko Rasic <senko.rasic at collabora.co.uk>
    test code reorganization, step 1: move related twisted tests into separate subdirectories

  Senko Rasic <senko.rasic at collabora.co.uk>
    removed run-with-tmp-session-bus.sh, we use the tp-glib's version (already in tools/)

  Senko Rasic <senko.rasic at collabora.co.uk>
    properly recurse into tests/twisted for make all/clean

  Senko Rasic <senko.rasic at collabora.co.uk>
    simplifying tests/twisted/Makefile.am, changing it to use with-session-bus.sh script

  Senko Rasic <senko.rasic at collabora.co.uk>
    added simple tests for incoming calls, successfull outgoing calls and rejected outgoing calls

  Senko Rasic <senko.rasic at collabora.co.uk>
    added support for jingle testing