[telepathy-gabble/master] Move the suppression file to a more generic path

[Sjoerd Simons]

---
 configure.ac                                       |    1 +
 tests/Makefile.am                                  |    2 +-
 tests/suppressions/Makefile.am                     |    2 ++
 tests/{twisted/tools => suppressions}/tp-glib.supp |    0 
 tests/twisted/tools/exec-with-log.sh.in            |    2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 tests/suppressions/Makefile.am
 rename tests/{twisted/tools => suppressions}/tp-glib.supp (100%)

diff --git a/configure.ac b/configure.ac
index b57629f..70ddede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,6 +239,7 @@ AC_OUTPUT( Makefile \
            data/Makefile \
            tests/Makefile \
            tools/Makefile \
+           tests/suppressions/Makefile \
            tests/twisted/Makefile \
            tests/twisted/tools/Makefile \
            lib/Makefile \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 64d59da..b20a5b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 if WANT_TWISTED_TESTS
 CHECKTWISTED = twisted
 endif
-SUBDIRS = $(CHECKTWISTED)
+SUBDIRS = $(CHECKTWISTED) suppressions
 
 noinst_PROGRAMS = \
 	test-base64 \
diff --git a/tests/suppressions/Makefile.am b/tests/suppressions/Makefile.am
new file mode 100644
index 0000000..c145978
--- /dev/null
+++ b/tests/suppressions/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = gabble.supp tp-glib.supp
+
diff --git a/tests/twisted/tools/tp-glib.supp b/tests/suppressions/tp-glib.supp
similarity index 100%
rename from tests/twisted/tools/tp-glib.supp
rename to tests/suppressions/tp-glib.supp
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index 4893887..e8036b5 100644
--- a/tests/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -14,7 +14,7 @@ if test -n "$GABBLE_TEST_VALGRIND"; then
         GABBLE_WRAPPER="$GABBLE_WRAPPER --show-reachable=yes"
         GABBLE_WRAPPER="$GABBLE_WRAPPER --gen-suppressions=all"
         GABBLE_WRAPPER="$GABBLE_WRAPPER --child-silent-after-fork=yes"
-        GABBLE_WRAPPER="$GABBLE_WRAPPER --suppressions=@abs_top_srcdir@/tests/twisted/tools/tp-glib.supp"
+        GABBLE_WRAPPER="$GABBLE_WRAPPER --suppressions=@abs_top_srcdir@/tests/suppressions/tp-glib.supp"
 elif test -n "$GABBLE_TEST_REFDBG"; then
         if test -z "$REFDBG_OPTIONS" ; then
                 export REFDBG_OPTIONS="btnum=10"
-- 
1.5.6.5