check: update internal libcheck to 0.9.8

14 files changed, 386 insertions, 269 deletions

diff --git a/check-checks.m4 b/check-checks.m4
index 73f37dff7d..366c26f7da 100644
--- a/check-checks.m4
+++ b/check-checks.m4
@@ -7,7 +7,7 @@ AC_MSG_NOTICE([Running check unit test framework checks now...])
 
 CHECK_MAJOR_VERSION=0
 CHECK_MINOR_VERSION=9
-CHECK_MICRO_VERSION=6
+CHECK_MICRO_VERSION=8
 CHECK_VERSION=$CHECK_MAJOR_VERSION.$CHECK_MINOR_VERSION.$CHECK_MICRO_VERSION
 
 AC_SUBST(CHECK_MAJOR_VERSION)
diff --git a/libs/gst/check/libcheck/check.c b/libs/gst/check/libcheck/check.c
index e1ee7a9502..3073a1b536 100644
--- a/libs/gst/check/libcheck/check.c
+++ b/libs/gst/check/libcheck/check.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -47,65 +47,6 @@ static void tr_init (TestResult * tr);
 static void suite_free (Suite * s);
 static void tcase_free (TCase * tc);
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-#undef malloc
-#undef realloc
-#undef strsignal
-
-#include <sys/types.h>
-
-void *malloc (size_t n);
-void *realloc (void *p, size_t n);
-char *strsignal (int sig);
-
-void *rpl_malloc (size_t n);
-void *rpl_realloc (void *p, size_t n);
-static const char *rpl_strsignal (int sig);
-
-/* Allocate an N-byte block of memory from the heap. If N is zero,
-   allocate a 1-byte block. */
-void *
-rpl_malloc (size_t n)
-{
-  if (n == 0)
-    n = 1;
-  return malloc (n);
-}
-
-/* AC_FUNC_REALLOC in configure defines realloc to rpl_realloc if
-   realloc(0,0) is NULL to make it GNU compatible and always return a
-   valid pointer, same for AC_FUNC_MALLOC, malloc, and rpl_malloc.
-   rpl means `replacement'.
-
-   If this ever turns out to be a problem, it might be easiest to just
-   kill the configure macro calls.
- */
-void *
-rpl_realloc (void *p, size_t n)
-{
-  if (n == 0)
-    n = 1;
-  if (p == 0)
-    return malloc (n);
-  return realloc (p, n);
-}
-
-/* We simply don't have strsignal on some platforms.  This function
-   should get used if AC_REPLACE_FUNCS([strsignal]) cannot find
-   something acceptable.  Note that Gnulib has a much much much more
-   advanced version of strsignal, but we don't really care.
-*/
-static const char *
-rpl_strsignal (int sig)
-{
-  static char signame[40];
-
-  sprintf (signame, "SIG #%d", sig);
-  return signame;
-}
-
 Suite *
 suite_create (const char *name)
 {
@@ -152,6 +93,14 @@ tcase_create (const char *name)
     }
   }
 
+  env = getenv ("CK_TIMEOUT_MULTIPLIER");
+  if (env != NULL) {
+    int tmp = atoi (env);
+    if (tmp >= 0) {
+      timeout = timeout * tmp;
+    }
+  }
+
   tc->timeout = timeout;
   tc->tflst = check_list_create ();
   tc->unch_sflst = check_list_create ();
@@ -189,8 +138,8 @@ suite_add_tcase (Suite * s, TCase * tc)
 }
 
 void
-_tcase_add_test (TCase * tc, TFun fn, const char *name, int _signal, int start,
-    int end)
+_tcase_add_test (TCase * tc, TFun fn, const char *name, int _signal,
+    int allowed_exit_value, int start, int end)
 {
   TF *tf;
   if (tc == NULL || fn == NULL || name == NULL)
@@ -200,6 +149,7 @@ _tcase_add_test (TCase * tc, TFun fn, const char *name, int _signal, int start,
   tf->loop_start = start;
   tf->loop_end = end;
   tf->signal = _signal;         /* 0 means no signal expected */
+  tf->allowed_exit_value = allowed_exit_value;  /* 0 is default successful exit */
   tf->name = name;
   list_add_end (tc->tflst, tf);
 }
@@ -249,12 +199,21 @@ tcase_add_fixture (TCase * tc, SFun setup, SFun teardown, int ischecked)
 void
 tcase_set_timeout (TCase * tc, int timeout)
 {
-  if (timeout >= 0)
+  if (timeout >= 0) {
+    char *env = getenv ("CK_TIMEOUT_MULTIPLIER");
+    if (env != NULL) {
+      int tmp = atoi (env);
+      if (tmp >= 0) {
+        timeout = timeout * tmp;
+      }
+    }
     tc->timeout = timeout;
+  }
 }
 
 void
-tcase_fn_start (const char *fname, const char *file, int line)
+tcase_fn_start (const char *fname CK_ATTRIBUTE_UNUSED, const char *file,
+    int line)
 {
   send_ctx_info (CK_CTX_TEST);
   send_loc_info (file, line);
@@ -283,8 +242,11 @@ _fail_unless (int result, const char *file, int line, const char *expr, ...)
     vsnprintf (buf, BUFSIZ, msg, ap);
     va_end (ap);
     send_failure_info (buf);
-    if (cur_fork_status () == CK_FORK)
+    if (cur_fork_status () == CK_FORK) {
+#ifdef _POSIX_VERSION
       exit (1);
+#endif /* _POSIX_VERSION */
+    }
   }
 }
 
diff --git a/libs/gst/check/libcheck/check.h.in b/libs/gst/check/libcheck/check.h.in
index 57f4a5b4ed..231fdbb568 100644
--- a/libs/gst/check/libcheck/check.h.in
+++ b/libs/gst/check/libcheck/check.h.in
@@ -131,7 +131,11 @@ TCase * CK_EXPORT tcase_create (const char *name);
 
 /* Add a test function with signal handling to a test case (macro version) */
 #define tcase_add_test_raise_signal(tc,tf,signal) \
-   _tcase_add_test((tc),(tf),"" # tf "",(signal), 0, 1)
+   _tcase_add_test((tc),(tf),"" # tf "",(signal), 0, 0, 1)
+
+/* Add a test function with an expected exit value to a test case (macro version) */
+#define tcase_add_exit_test(tc, tf, expected_exit_value) \
+  _tcase_add_test((tc),(tf),"" # tf "",0,(expected_exit_value),0,1)
 
 /* Add a looping test function to a test case (macro version)
 
@@ -140,18 +144,22 @@ TCase * CK_EXPORT tcase_create (const char *name);
    available in the test.
  */
 #define tcase_add_loop_test(tc,tf,s,e) \
-   _tcase_add_test((tc),(tf),"" # tf "",0,(s),(e))
+  _tcase_add_test((tc),(tf),"" # tf "",0,0,(s),(e))
  
 /* Signal version of loop test.  
    FIXME: add a test case; this is untested as part of Check's tests.
  */
 #define tcase_add_loop_test_raise_signal(tc,tf,signal,s,e) \
-   _tcase_add_test((tc),(tf),"" # tf "",(signal),(s),(e))
+  _tcase_add_test((tc),(tf),"" # tf "",(signal),0,(s),(e))
+
+/* allowed exit value version of loop test. */
+#define tcase_add_loop_exit_test(tc,tf,expected_exit_value,s,e) \
+  _tcase_add_test((tc),(tf),"" # tf "",0,(expected_exit_value),(s),(e))
 
 /* Add a test function to a test case
   (function version -- use this when the macro won't work
 */
-void CK_EXPORT _tcase_add_test (TCase *tc, TFun tf, const char *fname, int _signal, int start, int end);
+void CK_EXPORT _tcase_add_test (TCase *tc, TFun tf, const char *fname, int _signal, int allowed_exit_value, int start, int end);
 
 /* Add unchecked fixture setup/teardown functions to a test case
 
@@ -197,7 +205,7 @@ void CK_EXPORT tcase_fn_start (const char *fname, const char *file, int line);
    One must use braces within a START_/END_ pair to declare new variables
 */ 
 #define START_TEST(__testname)\
-static void __testname (int CK_ATTRIBUTE_UNUSED _i)\
+static void __testname (int _i CK_ATTRIBUTE_UNUSED)\
 {\
   tcase_fn_start (""# __testname, __FILE__, __LINE__);
 
@@ -272,6 +280,9 @@ enum print_output {
   CK_NORMAL, /* All failed tests */
   CK_VERBOSE, /* All tests */
   CK_ENV, /* Look at environment var */
+#if @ENABLE_SUBUNIT@
+  CK_SUBUNIT, /* Run as a subunit child process */
+#endif
   CK_LAST
 };
 
diff --git a/libs/gst/check/libcheck/check_error.c b/libs/gst/check/libcheck/check_error.c
index 71add6d730..b0273f0ccb 100644
--- a/libs/gst/check/libcheck/check_error.c
+++ b/libs/gst/check/libcheck/check_error.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/libs/gst/check/libcheck/check_impl.h b/libs/gst/check/libcheck/check_impl.h
index c8293b56f4..907950c4ca 100644
--- a/libs/gst/check/libcheck/check_impl.h
+++ b/libs/gst/check/libcheck/check_impl.h
@@ -33,6 +33,7 @@ typedef struct TF {
   int loop_end;
   const char *name;
   int signal;
+  unsigned char allowed_exit_value;
 } TF;
 
 struct Suite {
@@ -83,6 +84,7 @@ enum cl_event {
   CLSTART_S,
   CLEND_SR,
   CLEND_S,
+  CLSTART_T, /* A test case is about to run */
   CLEND_T
 };
 
diff --git a/libs/gst/check/libcheck/check_list.c b/libs/gst/check/libcheck/check_list.c
index d73a222795..f8949a0511 100644
--- a/libs/gst/check/libcheck/check_list.c
+++ b/libs/gst/check/libcheck/check_list.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libs/gst/check/libcheck/check_log.c b/libs/gst/check/libcheck/check_log.c
index aeb124f1e8..e30258facb 100644
--- a/libs/gst/check/libcheck/check_log.c
+++ b/libs/gst/check/libcheck/check_log.c
@@ -18,19 +18,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/time.h>
-#include <time.h>
 #include <check.h>
+#if HAVE_SUBUNIT_CHILD_H
+#include <subunit/child.h>
+#endif
 
 #include "check_error.h"
 #include "check_list.h"
 #include "check_impl.h"
 #include "check_log.h"
 #include "check_print.h"
+#include "check_str.h"
 
 
 static void srunner_send_evt (SRunner * sr, void *obj, enum cl_event evt);
@@ -119,6 +121,14 @@ log_suite_end (SRunner * sr, Suite * s)
 }
 
 void
+log_test_start (SRunner * sr, TCase * tc, TF * tfun)
+{
+  char buffer[100];
+  snprintf (buffer, 99, "%s:%s", tc->name, tfun->name);
+  srunner_send_evt (sr, buffer, CLSTART_T);
+}
+
+void
 log_test_end (SRunner * sr, TestResult * tr)
 {
   srunner_send_evt (sr, tr, CLEND_T);
@@ -142,7 +152,6 @@ void
 stdout_lfun (SRunner * sr, FILE * file, enum print_output printmode,
     void *obj, enum cl_event evt)
 {
-  TestResult *tr;
   Suite *s;
 
   if (printmode == CK_ENV) {
@@ -177,8 +186,9 @@ stdout_lfun (SRunner * sr, FILE * file, enum print_output printmode,
     case CLEND_S:
       s = obj;
       break;
+    case CLSTART_T:
+      break;
     case CLEND_T:
-      tr = obj;
       break;
     default:
       eprintf ("Bad event type received in stdout_lfun", __FILE__, __LINE__);
@@ -188,8 +198,9 @@ stdout_lfun (SRunner * sr, FILE * file, enum print_output printmode,
 }
 
 void
-lfile_lfun (SRunner * sr, FILE * file, enum print_output printmode,
-    void *obj, enum cl_event evt)
+lfile_lfun (SRunner * sr, FILE * file,
+    enum print_output printmode CK_ATTRIBUTE_UNUSED, void *obj,
+    enum cl_event evt)
 {
   TestResult *tr;
   Suite *s;
@@ -212,20 +223,23 @@ lfile_lfun (SRunner * sr, FILE * file, enum print_output printmode,
     case CLEND_S:
       s = obj;
       break;
+    case CLSTART_T:
+      break;
     case CLEND_T:
       tr = obj;
       tr_fprint (file, tr, CK_VERBOSE);
       break;
     default:
-      eprintf ("Bad event type received in stdout_lfun", __FILE__, __LINE__);
+      eprintf ("Bad event type received in lfile_lfun", __FILE__, __LINE__);
   }
 
 
 }
 
 void
-xml_lfun (SRunner * sr, FILE * file, enum print_output printmode,
-    void *obj, enum cl_event evt)
+xml_lfun (SRunner * sr CK_ATTRIBUTE_UNUSED, FILE * file,
+    enum print_output printmode CK_ATTRIBUTE_UNUSED, void *obj,
+    enum cl_event evt)
 {
   TestResult *tr;
   Suite *s;
@@ -266,6 +280,8 @@ xml_lfun (SRunner * sr, FILE * file, enum print_output printmode,
       fprintf (file, "  </suite>\n");
       s = obj;
       break;
+    case CLSTART_T:
+      break;
     case CLEND_T:
       tr = obj;
       tr_xmlprint (file, tr, CK_VERBOSE);
@@ -276,6 +292,67 @@ xml_lfun (SRunner * sr, FILE * file, enum print_output printmode,
 
 }
 
+#if ENABLE_SUBUNIT
+void
+subunit_lfun (SRunner * sr, FILE * file, enum print_output printmode,
+    void *obj, enum cl_event evt)
+{
+  TestResult *tr;
+  Suite *s;
+  char const *name;
+
+  /* assert(printmode == CK_SUBUNIT); */
+
+  switch (evt) {
+    case CLINITLOG_SR:
+      break;
+    case CLENDLOG_SR:
+      break;
+    case CLSTART_SR:
+      break;
+    case CLSTART_S:
+      s = obj;
+      break;
+    case CLEND_SR:
+      if (printmode > CK_SILENT) {
+        fprintf (file, "\n");
+        srunner_fprint (file, sr, printmode);
+      }
+      break;
+    case CLEND_S:
+      s = obj;
+      break;
+    case CLSTART_T:
+      name = obj;
+      subunit_test_start (name);
+      break;
+    case CLEND_T:
+      tr = obj;
+      {
+        char *name = ck_strdup_printf ("%s:%s", tr->tcname, tr->tname);
+        char *msg = tr_short_str (tr);
+        switch (tr->rtype) {
+          case CK_PASS:
+            subunit_test_pass (name);
+            break;
+          case CK_FAILURE:
+            subunit_test_fail (name, msg);
+            break;
+          case CK_ERROR:
+            subunit_test_error (name, msg);
+            break;
+          default:
+            eprintf ("Bad result type in subunit_lfun", __FILE__, __LINE__);
+            free (name);
+            free (msg);
+        }
+      }
+      break;
+    default:
+      eprintf ("Bad event type received in subunit_lfun", __FILE__, __LINE__);
+  }
+}
+#endif
 
 FILE *
 srunner_open_lfile (SRunner * sr)
@@ -308,7 +385,14 @@ srunner_init_logging (SRunner * sr, enum print_output print_mode)
 {
   FILE *f;
   sr->loglst = check_list_create ();
-  srunner_register_lfun (sr, stdout, 0, stdout_lfun, print_mode);
+#if ENABLE_SUBUNIT
+  if (print_mode != CK_SUBUNIT)
+#endif
+    srunner_register_lfun (sr, stdout, 0, stdout_lfun, print_mode);
+#if ENABLE_SUBUNIT
+  else
+    srunner_register_lfun (sr, stdout, 0, subunit_lfun, print_mode);
+#endif
   f = srunner_open_lfile (sr);
   if (f) {
     srunner_register_lfun (sr, f, 1, lfile_lfun, print_mode);
diff --git a/libs/gst/check/libcheck/check_log.h b/libs/gst/check/libcheck/check_log.h
index e0a4b29ee1..3ed38eeb11 100644
--- a/libs/gst/check/libcheck/check_log.h
+++ b/libs/gst/check/libcheck/check_log.h
@@ -26,6 +26,7 @@ void log_srunner_end (SRunner *sr);
 void log_suite_start (SRunner *sr, Suite *s);
 void log_suite_end (SRunner *sr, Suite *s);
 void log_test_end (SRunner *sr, TestResult *tr);
+void log_test_start (SRunner *sr, TCase *tc, TF *tfun);
 
 void stdout_lfun (SRunner *sr, FILE *file, enum print_output,
 		  void *obj, enum cl_event evt);
@@ -36,6 +37,9 @@ void lfile_lfun (SRunner *sr, FILE *file, enum print_output,
 void xml_lfun (SRunner *sr, FILE *file, enum print_output,
 		  void *obj, enum cl_event evt);
 
+void subunit_lfun (SRunner *sr, FILE *file, enum print_output,
+		  void *obj, enum cl_event evt);
+
 void srunner_register_lfun (SRunner *sr, FILE *lfile, int close,
 			    LFun lfun, enum print_output);
 
diff --git a/libs/gst/check/libcheck/check_msg.c b/libs/gst/check/libcheck/check_msg.c
index bf4099712f..6cc1b0c25a 100644
--- a/libs/gst/check/libcheck/check_msg.c
+++ b/libs/gst/check/libcheck/check_msg.c
@@ -18,10 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -73,7 +72,7 @@ get_pipe (void)
   if (send_file1 != 0) {
     return send_file1;
   }
-  printf ("send_file1=%p,send_file2=%p", send_file1, send_file2);
+
   eprintf ("No messaging setup", __FILE__, __LINE__);
 
   return NULL;
diff --git a/libs/gst/check/libcheck/check_pack.c b/libs/gst/check/libcheck/check_pack.c
index 0327a11800..3d4aeab006 100644
--- a/libs/gst/check/libcheck/check_pack.c
+++ b/libs/gst/check/libcheck/check_pack.c
@@ -18,26 +18,23 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 #endif
 
-#include "_stdint.h"
-
 #include "check.h"
 #include "check_error.h"
 #include "check_list.h"
 #include "check_impl.h"
 #include "check_pack.h"
 
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
+#ifdef HAVE_PTHREAD
 pthread_mutex_t lock_mutex = PTHREAD_MUTEX_INITIALIZER;
 #else
 #define pthread_mutex_lock(arg)
@@ -271,7 +268,7 @@ check_type (int type, const char *file, int line)
     eprintf ("Bad message type arg %d", file, line, type);
 }
 
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
 pthread_mutex_t mutex_lock = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
diff --git a/libs/gst/check/libcheck/check_print.c b/libs/gst/check/libcheck/check_print.c
index e874b63081..2b71b27d52 100644
--- a/libs/gst/check/libcheck/check_print.c
+++ b/libs/gst/check/libcheck/check_print.c
@@ -18,8 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -57,6 +56,11 @@ srunner_fprint (FILE * file, SRunner * sr, enum print_output print_mode)
 static void
 srunner_fprint_summary (FILE * file, SRunner * sr, enum print_output print_mode)
 {
+#if ENABLE_SUBUNIT
+  if (print_mode == CK_SUBUNIT)
+    return;
+#endif
+
   if (print_mode >= CK_MINIMAL) {
     char *str;
 
@@ -72,6 +76,11 @@ srunner_fprint_results (FILE * file, SRunner * sr, enum print_output print_mode)
 {
   List *resultlst;
 
+#if ENABLE_SUBUNIT
+  if (print_mode == CK_SUBUNIT)
+    return;
+#endif
+
   resultlst = sr->resultlst;
 
   for (list_front (resultlst); !list_at_end (resultlst);
@@ -98,7 +107,8 @@ tr_fprint (FILE * file, TestResult * tr, enum print_output print_mode)
 }
 
 void
-tr_xmlprint (FILE * file, TestResult * tr, enum print_output print_mode)
+tr_xmlprint (FILE * file, TestResult * tr,
+    enum print_output print_mode CK_ATTRIBUTE_UNUSED)
 {
   char result[10];
   char *path_name;
diff --git a/libs/gst/check/libcheck/check_run.c b/libs/gst/check/libcheck/check_run.c
index 31baa54f95..74e6de559a 100644
--- a/libs/gst/check/libcheck/check_run.c
+++ b/libs/gst/check/libcheck/check_run.c
@@ -18,12 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -53,38 +50,44 @@ enum tf_type
   CK_NOFORK_FIXTURE
 };
 
+/* all functions are defined in the same order they are declared.
+   functions that depend on forking are gathered all together.
+   non-static functions are at the end of the file. */
 static void srunner_run_init (SRunner * sr, enum print_output print_mode);
 static void srunner_run_end (SRunner * sr, enum print_output print_mode);
 static void srunner_iterate_suites (SRunner * sr, enum print_output print_mode);
-static void srunner_run_tcase (SRunner * sr, TCase * tc);
+static void srunner_iterate_tcase_tfuns (SRunner * sr, TCase * tc);
+static void srunner_add_failure (SRunner * sr, TestResult * tf);
 static int srunner_run_unchecked_setup (SRunner * sr, TCase * tc);
-static void srunner_run_unchecked_teardown (SRunner * sr, TCase * tc);
 static TestResult *tcase_run_checked_setup (SRunner * sr, TCase * tc);
+static void srunner_run_teardown (List * l);
+static void srunner_run_unchecked_teardown (TCase * tc);
 static void tcase_run_checked_teardown (TCase * tc);
-static void srunner_iterate_tcase_tfuns (SRunner * sr, TCase * tc);
-static void srunner_add_failure (SRunner * sr, TestResult * tf);
-static TestResult *tcase_run_tfun_fork (SRunner * sr, TCase * tc, TF * tf,
-    int i);
+static void srunner_run_tcase (SRunner * sr, TCase * tc);
 static TestResult *tcase_run_tfun_nofork (SRunner * sr, TCase * tc, TF * tf,
     int i);
-static TestResult *receive_result_info_fork (const char *tcname,
-    const char *tname, int iter, int status, int expected_signal);
 static TestResult *receive_result_info_nofork (const char *tcname,
     const char *tname, int iter);
-static void set_fork_info (TestResult * tr, int status, int expected_signal);
 static void set_nofork_info (TestResult * tr);
+static char *pass_msg (void);
+
+#ifdef _POSIX_VERSION
+static TestResult *tcase_run_tfun_fork (SRunner * sr, TCase * tc, TF * tf,
+    int i);
+static TestResult *receive_result_info_fork (const char *tcname,
+    const char *tname, int iter, int status, int expected_signal,
+    unsigned char allowed_exit_value);
+static void set_fork_info (TestResult * tr, int status, int expected_signal,
+    unsigned char allowed_exit_value);
 static char *signal_msg (int sig);
 static char *signal_error_msg (int signal_received, int signal_expected);
-static char *pass_msg (void);
 static char *exit_msg (int exitstatus);
 static int waserror (int status, int expected_signal);
 
-#define MSG_LEN 100
-
 static int alarm_received;
 static pid_t group_pid;
 
-static void
+static void CK_ATTRIBUTE_UNUSED
 sig_handler (int sig_nr)
 {
   switch (sig_nr) {
@@ -97,6 +100,9 @@ sig_handler (int sig_nr)
       break;
   }
 }
+#endif /* _POSIX_VERSION */
+
+#define MSG_LEN 100
 
 static void
 srunner_run_init (SRunner * sr, enum print_output print_mode)
@@ -108,7 +114,7 @@ srunner_run_init (SRunner * sr, enum print_output print_mode)
 }
 
 static void
-srunner_run_end (SRunner * sr, enum print_output print_mode)
+srunner_run_end (SRunner * sr, enum print_output CK_ATTRIBUTE_UNUSED print_mode)
 {
   log_srunner_end (sr);
   srunner_end_logging (sr);
@@ -117,7 +123,8 @@ srunner_run_end (SRunner * sr, enum print_output print_mode)
 }
 
 static void
-srunner_iterate_suites (SRunner * sr, enum print_output print_mode)
+srunner_iterate_suites (SRunner * sr,
+    enum print_output CK_ATTRIBUTE_UNUSED print_mode)
 {
   List *slst;
   List *tcl;
@@ -141,39 +148,6 @@ srunner_iterate_suites (SRunner * sr, enum print_output print_mode)
   }
 }
 
-void
-srunner_run_all (SRunner * sr, enum print_output print_mode)
-{
-  struct sigaction old_action;
-  struct sigaction new_action;
-
-  if (sr == NULL)
-    return;
-  if (print_mode >= CK_LAST) {
-    eprintf ("Bad print_mode argument to srunner_run_all: %d",
-        __FILE__, __LINE__, print_mode);
-  }
-  memset (&new_action, 0, sizeof new_action);
-  new_action.sa_handler = sig_handler;
-  sigaction (SIGALRM, &new_action, &old_action);
-  srunner_run_init (sr, print_mode);
-  srunner_iterate_suites (sr, print_mode);
-  srunner_run_end (sr, print_mode);
-  sigaction (SIGALRM, &old_action, NULL);
-}
-
-static void
-srunner_add_failure (SRunner * sr, TestResult * tr)
-{
-  list_add_end (sr->resultlst, tr);
-  sr->stats->n_checked++;       /* count checks during setup, test, and teardown */
-  if (tr->rtype == CK_FAILURE)
-    sr->stats->n_failed++;
-  else if (tr->rtype == CK_ERROR)
-    sr->stats->n_errors++;
-
-}
-
 static void
 srunner_iterate_tcase_tfuns (SRunner * sr, TCase * tc)
 {
@@ -188,9 +162,14 @@ srunner_iterate_tcase_tfuns (SRunner * sr, TCase * tc)
     tfun = list_val (tfl);
 
     for (i = tfun->loop_start; i < tfun->loop_end; i++) {
+      log_test_start (sr, tc, tfun);
       switch (srunner_fork_status (sr)) {
         case CK_FORK:
+#ifdef _POSIX_VERSION
           tr = tcase_run_tfun_fork (sr, tc, tfun, i);
+#else /* _POSIX_VERSION */
+          eprintf ("This version does not support fork", __FILE__, __LINE__);
+#endif /* _POSIX_VERSION */
           break;
         case CK_NOFORK:
           tr = tcase_run_tfun_nofork (sr, tc, tfun, i);
@@ -204,6 +183,18 @@ srunner_iterate_tcase_tfuns (SRunner * sr, TCase * tc)
   }
 }
 
+static void
+srunner_add_failure (SRunner * sr, TestResult * tr)
+{
+  list_add_end (sr->resultlst, tr);
+  sr->stats->n_checked++;       /* count checks during setup, test, and teardown */
+  if (tr->rtype == CK_FAILURE)
+    sr->stats->n_failed++;
+  else if (tr->rtype == CK_ERROR)
+    sr->stats->n_errors++;
+
+}
+
 static int
 srunner_run_unchecked_setup (SRunner * sr, TCase * tc)
 {
@@ -275,37 +266,27 @@ tcase_run_checked_setup (SRunner * sr, TCase * tc)
 }
 
 static void
-tcase_run_checked_teardown (TCase * tc)
+srunner_run_teardown (List * l)
 {
-  List *l;
   Fixture *f;
 
-  l = tc->ch_tflst;
-
-  send_ctx_info (CK_CTX_TEARDOWN);
-
   for (list_front (l); !list_at_end (l); list_advance (l)) {
     f = list_val (l);
+    send_ctx_info (CK_CTX_TEARDOWN);
     f->fun ();
   }
 }
 
 static void
-srunner_run_unchecked_teardown (SRunner * sr, TCase * tc)
+srunner_run_unchecked_teardown (TCase * tc)
 {
-  List *l;
-  Fixture *f;
-
-  set_fork_status (CK_NOFORK);
-  l = tc->unch_tflst;
-
-  for (list_front (l); !list_at_end (l); list_advance (l)) {
+  srunner_run_teardown (tc->unch_tflst);
+}
 
-    f = list_val (l);
-    send_ctx_info (CK_CTX_TEARDOWN);
-    f->fun ();
-  }
-  set_fork_status (srunner_fork_status (sr));
+static void
+tcase_run_checked_teardown (TCase * tc)
+{
+  srunner_run_teardown (tc->ch_tflst);
 }
 
 static void
@@ -313,45 +294,115 @@ srunner_run_tcase (SRunner * sr, TCase * tc)
 {
   if (srunner_run_unchecked_setup (sr, tc)) {
     srunner_iterate_tcase_tfuns (sr, tc);
-    srunner_run_unchecked_teardown (sr, tc);
+    srunner_run_unchecked_teardown (tc);
   }
 }
 
 static TestResult *
-receive_result_info_fork (const char *tcname,
-    const char *tname, int iter, int status, int expected_signal)
+tcase_run_tfun_nofork (SRunner * sr, TCase * tc, TF * tfun, int i)
 {
   TestResult *tr;
 
-  tr = receive_test_result (waserror (status, expected_signal));
+  tr = tcase_run_checked_setup (sr, tc);
+  if (tr == NULL) {
+    tfun->fn (i);
+    tcase_run_checked_teardown (tc);
+    return receive_result_info_nofork (tc->name, tfun->name, i);
+  }
+
+  return tr;
+}
+
+static TestResult *
+receive_result_info_nofork (const char *tcname, const char *tname, int iter)
+{
+  TestResult *tr;
+
+  tr = receive_test_result (0);
   if (tr == NULL)
     eprintf ("Failed to receive test result", __FILE__, __LINE__);
   tr->tcname = tcname;
   tr->tname = tname;
   tr->iter = iter;
-  set_fork_info (tr, status, expected_signal);
+  set_nofork_info (tr);
 
   return tr;
 }
 
+static void
+set_nofork_info (TestResult * tr)
+{
+  if (tr->msg == NULL) {
+    tr->rtype = CK_PASS;
+    tr->msg = pass_msg ();
+  } else {
+    tr->rtype = CK_FAILURE;
+  }
+}
+
+static char *
+pass_msg (void)
+{
+  char *msg = emalloc (sizeof ("Passed"));
+  strcpy (msg, "Passed");
+  return msg;
+}
+
+#ifdef _POSIX_VERSION
 static TestResult *
-receive_result_info_nofork (const char *tcname, const char *tname, int iter)
+tcase_run_tfun_fork (SRunner * sr, TCase * tc, TF * tfun, int i)
+{
+  pid_t pid_w;
+  pid_t pid;
+  int status = 0;
+
+  pid = fork ();
+  if (pid == -1)
+    eprintf ("Error in call to fork:", __FILE__, __LINE__ - 2);
+  if (pid == 0) {
+    setpgid (0, 0);
+    group_pid = getpgrp ();
+    tcase_run_checked_setup (sr, tc);
+    tfun->fn (i);
+    tcase_run_checked_teardown (tc);
+    exit (EXIT_SUCCESS);
+  } else {
+    group_pid = pid;
+  }
+
+  alarm_received = 0;
+  alarm (tc->timeout);
+  do {
+    pid_w = waitpid (pid, &status, 0);
+  } while (pid_w == -1);
+
+  killpg (pid, SIGKILL);        /* Kill remaining processes. */
+
+  return receive_result_info_fork (tc->name, tfun->name, i, status,
+      tfun->signal, tfun->allowed_exit_value);
+}
+
+static TestResult *
+receive_result_info_fork (const char *tcname,
+    const char *tname,
+    int iter, int status, int expected_signal, unsigned char allowed_exit_value)
 {
   TestResult *tr;
 
-  tr = receive_test_result (0);
+  tr = receive_test_result (waserror (status, expected_signal));
   if (tr == NULL)
     eprintf ("Failed to receive test result", __FILE__, __LINE__);
   tr->tcname = tcname;
   tr->tname = tname;
   tr->iter = iter;
-  set_nofork_info (tr);
+  set_fork_info (tr, status, expected_signal, allowed_exit_value);
 
   return tr;
 }
 
 static void
-set_fork_info (TestResult * tr, int status, int signal_expected)
+set_fork_info (TestResult * tr, int status, int signal_expected,
+    unsigned char allowed_exit_value)
 {
   int was_sig = WIFSIGNALED (status);
   int was_exit = WIFEXITED (status);
@@ -378,10 +429,10 @@ set_fork_info (TestResult * tr, int status, int signal_expected)
       tr->msg = signal_msg (signal_received);
     }
   } else if (signal_expected == 0) {
-    if (was_exit && exit_status == 0) {
+    if (was_exit && exit_status == allowed_exit_value) {
       tr->rtype = CK_PASS;
       tr->msg = pass_msg ();
-    } else if (was_exit && exit_status != 0) {
+    } else if (was_exit && exit_status != allowed_exit_value) {
       if (tr->msg == NULL) {    /* early exit */
         tr->rtype = CK_ERROR;
         tr->msg = exit_msg (exit_status);
@@ -392,7 +443,7 @@ set_fork_info (TestResult * tr, int status, int signal_expected)
   } else {                      /* a signal was expected and none raised */
     if (was_exit) {
       tr->msg = exit_msg (exit_status);
-      if (exit_status == 0)
+      if (exit_status == allowed_exit_value)
         tr->rtype = CK_FAILURE; /* normal exit status */
       else
         tr->rtype = CK_FAILURE; /* early exit */
@@ -400,63 +451,17 @@ set_fork_info (TestResult * tr, int status, int signal_expected)
   }
 }
 
-static void
-set_nofork_info (TestResult * tr)
-{
-  if (tr->msg == NULL) {
-    tr->rtype = CK_PASS;
-    tr->msg = pass_msg ();
-  } else {
-    tr->rtype = CK_FAILURE;
-  }
-}
-
-static TestResult *
-tcase_run_tfun_nofork (SRunner * sr, TCase * tc, TF * tfun, int i)
-{
-  TestResult *tr;
-
-  tr = tcase_run_checked_setup (sr, tc);
-  if (tr == NULL) {
-    tfun->fn (i);
-    tcase_run_checked_teardown (tc);
-    return receive_result_info_nofork (tc->name, tfun->name, i);
-  }
-
-  return tr;
-}
-
-
-static TestResult *
-tcase_run_tfun_fork (SRunner * sr, TCase * tc, TF * tfun, int i)
+static char *
+signal_msg (int signal)
 {
-  pid_t pid_w;
-  pid_t pid;
-  int status = 0;
-  pid = fork ();
-  if (pid == -1)
-    eprintf ("Error in call to fork:", __FILE__, __LINE__ - 2);
-  if (pid == 0) {
-    setpgid (0, 0);
-    group_pid = getpgrp ();
-    tcase_run_checked_setup (sr, tc);
-    tfun->fn (i);
-    tcase_run_checked_teardown (tc);
-    exit (EXIT_SUCCESS);
+  char *msg = emalloc (MSG_LEN);        /* free'd by caller */
+  if (alarm_received) {
+    snprintf (msg, MSG_LEN, "Test timeout expired");
   } else {
-    group_pid = pid;
+    snprintf (msg, MSG_LEN, "Received signal %d (%s)",
+        signal, strsignal (signal));
   }
-
-  alarm_received = 0;
-  alarm (tc->timeout);
-  do {
-    pid_w = waitpid (pid, &status, 0);
-  } while (pid_w == -1);
-
-  killpg (pid, SIGKILL);        /* Kill remaining processes. */
-
-  return receive_result_info_fork (tc->name, tfun->name, i, status,
-      tfun->signal);
+  return msg;
 }
 
 static char *
@@ -480,19 +485,6 @@ signal_error_msg (int signal_received, int signal_expected)
 }
 
 static char *
-signal_msg (int signal)
-{
-  char *msg = emalloc (MSG_LEN);        /* free'd by caller */
-  if (alarm_received) {
-    snprintf (msg, MSG_LEN, "Test timeout expired");
-  } else {
-    snprintf (msg, MSG_LEN, "Received signal %d (%s)",
-        signal, strsignal (signal));
-  }
-  return msg;
-}
-
-static char *
 exit_msg (int exitval)
 {
   char *msg = emalloc (MSG_LEN);        /* free'd by caller */
@@ -500,13 +492,18 @@ exit_msg (int exitval)
   return msg;
 }
 
-static char *
-pass_msg (void)
+static int
+waserror (int status, int signal_expected)
 {
-  char *msg = emalloc (sizeof ("Passed"));
-  strcpy (msg, "Passed");
-  return msg;
+  int was_sig = WIFSIGNALED (status);
+  int was_exit = WIFEXITED (status);
+  int exit_status = WEXITSTATUS (status);
+  int signal_received = WTERMSIG (status);
+
+  return ((was_sig && (signal_received != signal_expected)) ||
+      (was_exit && exit_status != 0));
 }
+#endif /* _POSIX_VERSION */
 
 enum fork_status
 srunner_fork_status (SRunner * sr)
@@ -517,8 +514,14 @@ srunner_fork_status (SRunner * sr)
       return CK_FORK;
     if (strcmp (env, "no") == 0)
       return CK_NOFORK;
-    else
+    else {
+#ifdef _POSIX_VERSION
       return CK_FORK;
+#else /* _POSIX_VERSION */
+      eprintf ("This version does not support fork", __FILE__, __LINE__);
+      return CK_NOFORK;
+#endif /* _POSIX_VERSION */
+    }
   } else
     return sr->fstat;
 }
@@ -529,18 +532,51 @@ srunner_set_fork_status (SRunner * sr, enum fork_status fstat)
   sr->fstat = fstat;
 }
 
+void
+srunner_run_all (SRunner * sr, enum print_output print_mode)
+{
+#ifdef _POSIX_VERSION
+  struct sigaction old_action;
+  struct sigaction new_action;
+#endif /* _POSIX_VERSION */
+
+  if (sr == NULL)
+    return;
+  if (print_mode >= CK_LAST) {
+    eprintf ("Bad print_mode argument to srunner_run_all: %d",
+        __FILE__, __LINE__, print_mode);
+  }
+#ifdef _POSIX_VERSION
+  memset (&new_action, 0, sizeof new_action);
+  new_action.sa_handler = sig_handler;
+  sigaction (SIGALRM, &new_action, &old_action);
+#endif /* _POSIX_VERSION */
+  srunner_run_init (sr, print_mode);
+  srunner_iterate_suites (sr, print_mode);
+  srunner_run_end (sr, print_mode);
+#ifdef _POSIX_VERSION
+  sigaction (SIGALRM, &old_action, NULL);
+#endif /* _POSIX_VERSION */
+}
+
 pid_t
 check_fork (void)
 {
+#ifdef _POSIX_VERSION
   pid_t pid = fork ();
   /* Set the process to a process group to be able to kill it easily. */
   setpgid (pid, group_pid);
   return pid;
+#else /* _POSIX_VERSION */
+  eprintf ("This version does not support fork", __FILE__, __LINE__);
+  return 0;
+#endif /* _POSIX_VERSION */
 }
 
 void
-check_waitpid_and_exit (pid_t pid)
+check_waitpid_and_exit (pid_t pid CK_ATTRIBUTE_UNUSED)
 {
+#ifdef _POSIX_VERSION
   pid_t pid_w;
   int status;
 
@@ -548,20 +584,12 @@ check_waitpid_and_exit (pid_t pid)
     do {
       pid_w = waitpid (pid, &status, 0);
     } while (pid_w == -1);
-    if (waserror (status, 0))
+    if (waserror (status, 0)) {
       exit (EXIT_FAILURE);
+    }
   }
   exit (EXIT_SUCCESS);
-}
-
-static int
-waserror (int status, int signal_expected)
-{
-  int was_sig = WIFSIGNALED (status);
-  int was_exit = WIFEXITED (status);
-  int exit_status = WEXITSTATUS (status);
-  int signal_received = WTERMSIG (status);
-
-  return ((was_sig && (signal_received != signal_expected)) ||
-      (was_exit && exit_status != 0));
+#else /* _POSIX_VERSION */
+  eprintf ("This version does not support fork", __FILE__, __LINE__);
+#endif /* _POSIX_VERSION */
 }
diff --git a/libs/gst/check/libcheck/check_str.c b/libs/gst/check/libcheck/check_str.c
index ce7274d444..87131be8ea 100644
--- a/libs/gst/check/libcheck/check_str.c
+++ b/libs/gst/check/libcheck/check_str.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include "../lib/libcompat.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -48,6 +48,20 @@ tr_str (TestResult * tr)
 }
 
 char *
+tr_short_str (TestResult * tr)
+{
+  const char *exact_msg;
+  char *rstr;
+
+  exact_msg = (tr->rtype == CK_ERROR) ? "(after this point) " : "";
+
+  rstr = ck_strdup_printf ("%s:%d: %s%s",
+      tr->file, tr->line, exact_msg, tr->msg);
+
+  return rstr;
+}
+
+char *
 sr_stat_str (SRunner * sr)
 {
   char *str;
diff --git a/libs/gst/check/libcheck/check_str.h b/libs/gst/check/libcheck/check_str.h
index bef230f7a1..bd41055026 100644
--- a/libs/gst/check/libcheck/check_str.h
+++ b/libs/gst/check/libcheck/check_str.h
@@ -25,6 +25,12 @@
    value has been malloc'd, and must be freed by the caller */
 char *tr_str (TestResult *tr);
 
+/* Return a string representation of the given TestResult message
+   without the test id or result type. This is suitable for separate
+   formatting of the test and the message. Return value has been 
+   malloc'd, and must be freed by the caller */
+char *tr_short_str (TestResult *tr);
+
 /* Return a string representation of the given SRunner's run
    statistics (% passed, num run, passed, errors, failures). Return
    value has been malloc'd, and must be freed by the caller