2007-07-24 Richard Hughes <richard@hughsie.com>

* bus/Makefile.am:
* bus/test-system.c: (die), (check_memleaks), (test_pre_hook),
(test_post_hook), (main):
Add back the test-system.c file - not sure now this got ignored in the
diff. I blame git.

diff --git a/ChangeLog b/ChangeLog
index 5c01294..f580a32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-07-24  Richard Hughes  <richard@hughsie.com>
 
+       * bus/Makefile.am:
+       * bus/test-system.c: (die), (check_memleaks), (test_pre_hook),
+       (test_post_hook), (main):
+       Add back the test-system.c file - not sure now this got ignored in the
+       diff. I blame git.
+
+2007-07-24  Richard Hughes  <richard@hughsie.com>
+
        * configure.in:
        Use ustar to generate the tarball; this fixes the make distcheck
        problem when the data files do not fit in the archive:

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 5892e33..d4eae30 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -138,7 +138,7 @@ bus_test_launch_helper_CPPFLAGS=    \
 ## TESTS
 if DBUS_BUILD_TESTS
 TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus DBUS_FATAL_WARNINGS=1 DBUS_BLOCK_ON_ABORT=1
-TESTS=bus-test bus-test-launch-helper
+TESTS=bus-test bus-test-system bus-test-launch-helper
 else
 TESTS=
 endif

diff --git a/bus/test-system.c b/bus/test-system.c
new file mode 100644 (file)
index 0000000..2ecca7e
--- /dev/null
+++ b/bus/test-system.c
@@ -0,0 +1,106 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* test-main.c  main() for make check
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "test.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <dbus/dbus-string.h>
+#include <dbus/dbus-sysdeps.h>
+#include <dbus/dbus-internals.h>
+
+#ifdef DBUS_BUILD_TESTS
+static void
+die (const char *failure)
+{
+  fprintf (stderr, "Unit test failed: %s\n", failure);
+  exit (1);
+}
+
+static void
+check_memleaks (const char *name)
+{
+  dbus_shutdown ();
+
+  printf ("%s: checking for memleaks\n", name);
+  if (_dbus_get_malloc_blocks_outstanding () != 0)
+    {
+      _dbus_warn ("%d dbus_malloc blocks were not freed\n",
+                  _dbus_get_malloc_blocks_outstanding ());
+      die ("memleaks");
+    }
+}
+#endif /* DBUS_BUILD_TESTS */
+
+static void
+test_pre_hook (void)
+{
+}
+
+static char *progname = "";
+static void
+test_post_hook (void)
+{
+  check_memleaks (progname);
+}
+
+int
+main (int argc, char **argv)
+{
+#ifdef DBUS_BUILD_TESTS
+  const char *dir;
+  DBusString test_data_dir;
+
+  progname = argv[0];
+
+  if (argc > 1)
+    dir = argv[1];
+  else
+    dir = _dbus_getenv ("DBUS_TEST_DATA");
+
+  if (dir == NULL)
+    {
+      fprintf (stderr, "Must specify test data directory as argv[1] or in DBUS_TEST_DATA env variable\n");
+      return 1;
+    }
+
+  _dbus_string_init_const (&test_data_dir, dir);
+
+  if (!_dbus_threads_init_debug ())
+    die ("initializing debug threads");
+
+  test_pre_hook ();
+  printf ("%s: Running config file parser (trivial) test\n", argv[0]);
+  if (!bus_config_parser_trivial_test (&test_data_dir))
+    die ("parser");
+  test_post_hook ();
+
+  printf ("%s: Success\n", argv[0]);
+
+  return 0;
+#else /* DBUS_BUILD_TESTS */
+
+  printf ("Not compiled with test support\n");
+
+  return 0;
+#endif
+}