2003-03-13 Havoc Pennington <hp@pobox.com>

	* bus/test.c, bus/test.h, bus/Makefile.am, bus/test-main.c:
	set up a test framework as for the library

7 files changed, 130 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9591317c..ac6dd553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-13  Havoc Pennington  <hp@pobox.com>
+
+	* bus/test.c, bus/test.h, bus/Makefile.am, bus/test-main.c: 
+	set up a test framework as for the library
+
 2003-03-12  Havoc Pennington  <hp@pobox.com>
 
 	Throughout: purge global variables, introduce BusActivation, 
diff --git a/bus/Makefile.am b/bus/Makefile.am
index f9f4dbfc..f8cff917 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -25,6 +25,8 @@ libdbus_daemon_la_SOURCES=			\
 	loop.h					\
 	services.c				\
 	services.h				\
+	test.c					\
+	test.h					\
 	utils.c					\
 	utils.h
 
@@ -40,3 +42,26 @@ dbus_daemon_1_LDADD=					\
 	$(DBUS_BUS_LIBS)				\
 	$(top_builddir)/bus/libdbus-daemon.la		\
 	$(top_builddir)/dbus/libdbus-1.la
+
+## note that TESTS has special meaning (stuff to use in make check)
+## so if adding tests not to be run in make check, don't add them to 
+## TESTS
+if DBUS_BUILD_TESTS
+TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_srcdir)/test/data
+TESTS=bus-test 
+else
+TESTS=
+endif
+
+## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
+## even when not doing "make check"
+noinst_PROGRAMS=$(TESTS)
+
+bus_test_SOURCES=				\
+	test-main.c
+
+bus_test_LDADD= $(top_builddir)/dbus/libdbus-convenience.la libdbus-daemon.la
+
+## mop up the gcov files
+clean-local:
+	/bin/rm *.bb *.bbg *.da *.gcov || true
diff --git a/bus/bus.h b/bus/bus.h
index 4d922f0c..eed279e6 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -24,6 +24,8 @@
 #ifndef BUS_BUS_H
 #define BUS_BUS_H
 
+#include <config.h>
+
 #include <dbus/dbus.h>
 #include <dbus/dbus-string.h>
 
diff --git a/bus/test-main.c b/bus/test-main.c
new file mode 100644
index 00000000..27c06f48
--- /dev/null
+++ b/bus/test-main.c
@@ -0,0 +1,37 @@
+/* -*- 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 1.2
+ * 
+ * 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"
+
+int
+main (int argc, char **argv)
+{
+#ifdef DBUS_BUILD_TESTS
+
+  
+  
+  return 0;
+#else /* DBUS_BUILD_TESTS */
+  return 0;
+#endif
+}
diff --git a/bus/test.c b/bus/test.c
new file mode 100644
index 00000000..16bea191
--- /dev/null
+++ b/bus/test.c
@@ -0,0 +1,23 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* test.c  unit test routines
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * 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
+ *
+ */
+
diff --git a/bus/test.h b/bus/test.h
new file mode 100644
index 00000000..2d39ac9f
--- /dev/null
+++ b/bus/test.h
@@ -0,0 +1,38 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* test.h  unit test routines
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * 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
+ *
+ */
+
+#ifndef BUS_TEST_H
+#define BUS_TEST_H
+
+#include <config.h>
+
+#ifdef DBUS_BUILD_TESTS
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-string.h>
+
+dbus_bool_t bus_test_foo (const DBusString *test_data_dir);
+
+#endif
+
+#endif /* BUS_TEST_H */
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 70504052..2f2a2bdc 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -101,10 +101,6 @@ libdbus_1_la_LIBADD=  $(DBUS_CLIENT_LIBS) libdbus-convenience.la
 ## convention for internal symbols)
 libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
 
-## FIXME it would be less annoying when hacking if we didn't have 
-## to relink these test binaries, so moving them to the test/* 
-## subdir would be nice.
-
 ## note that TESTS has special meaning (stuff to use in make check)
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS