[folks] Use autotools's parallel test harness

[Travis Reitter <treitter src gnome org>]

commit fd6f44d35663405fc93891a39a071fd6bedeecce
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Sep 24 16:23:46 2013 -0700

    Use autotools's parallel test harness
    
    We were already unintentionally using it in some cases (depending upon the
    developer's system) without the proper safeguards in place. Without them,
    the EDS and Tracker tests will mysteriously result in a ton of segfaulting
    background processes because they can't be safely run simultaneously.
    
    The upside of using the parallel harness is that it's still safe to use for
    the simpler test suites (eg, key-file, folks, telepathy) and should speed up
    their runtimes quite a bit. It also adds cleaner logging facilities and
    makes the default output a little cleaner.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=679826

 NEWS                      |    1 +
 configure.ac              |    3 ++-
 tests/eds/Makefile.am     |    6 ++++++
 tests/tracker/Makefile.am |    6 ++++++
 4 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index a3058f5..08c4077 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Bugs fixed:
   (transfer) annotation
 • Bug 697262 — uses deprecated e-d-s functions (Xavier)
 • Bug 705403 — Use GLib.BytesIcon instead of Edsf.MemoryIcon
+• Bug 679826 — Investigate using parallel-tests to speed up testing
 
 API changes:
 
diff --git a/configure.ac b/configure.ac
index d00dc94..7b45499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,8 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([1.11 dist-xz no-define
-                  no-dist-gzip tar-ustar -Wno-portability color-tests])
+                  no-dist-gzip tar-ustar -Wno-portability color-tests
+                  parallel-tests])
 AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am
index 08f9275..2a367ec 100644
--- a/tests/eds/Makefile.am
+++ b/tests/eds/Makefile.am
@@ -1,3 +1,9 @@
+# This forces serialization of the tests because they run into terrible race
+# conditions if run in parallel (ie, make -jN, n > 1)
+#
+# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=709119
+.NOTPARALLEL:
+
 AM_CFLAGS = \
        $(ERROR_CFLAGS) \
        $(NULL)
diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index 351a435..44db026 100644
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -1,3 +1,9 @@
+# This forces serialization of the tests because they run into terrible race
+# conditions if run in parallel (ie, make -jN, n > 1)
+#
+# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=709120
+.NOTPARALLEL:
+
 AM_CFLAGS = \
        $(ERROR_CFLAGS) \
        $(NULL)