From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 1 Dec 2013 16:34:48 +0000 (+0100)
Subject: Merged branch 'master' of git://git.tokkee.org/sysdb.
X-Git-Tag: sysdb-0.1.0~336
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2e2e989712ec5991526b3aaeec011440adb5bf7e;p=sysdb.git

Merged branch 'master' of git://git.tokkee.org/sysdb.

Conflicts:
	t/Makefile.am
	t/libsysdb_test.c
	t/libsysdb_test.h
---

2e2e989712ec5991526b3aaeec011440adb5bf7e
diff --cc t/Makefile.am
index 7d249e4,1e4419d..c31ac50
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@@ -6,7 -6,7 +6,8 @@@ check_PROGRAMS = libsysdb_test libsysdb
  
  libsysdb_test_SOURCES = \
  		libsysdb_test.c libsysdb_test.h \
 +		core/object_test.c \
+ 		utils/channel_test.c \
  		utils/dbi_test.c \
  		utils/llist_test.c \
  		utils/strbuf_test.c
diff --cc t/libsysdb_test.c
index 2693a8d,7ce4124..91909b8
--- a/t/libsysdb_test.c
+++ b/t/libsysdb_test.c
@@@ -37,9 -37,9 +37,10 @@@ main(void
  	size_t i;
  
  	suite_creator_t creators[] = {
 +		{ core_object_suite, NULL },
- 		{ util_llist_suite, NULL },
+ 		{ util_channel_suite, NULL },
  		{ util_dbi_suite, NULL },
+ 		{ util_llist_suite, NULL },
  		{ util_strbuf_suite, NULL },
  	};
  
diff --cc t/libsysdb_test.h
index 9d83dc6,da57246..eadeca5
--- a/t/libsysdb_test.h
+++ b/t/libsysdb_test.h
@@@ -59,10 -59,10 +59,14 @@@ typedef struct 
   * test suites
   */
  
 +/* t/core/object_test */
 +Suite *
 +core_object_suite(void);
 +
+ /* t/utils/channel_test */
+ Suite *
+ util_channel_suite(void);
+ 
  /* t/utils/dbi_test */
  Suite *
  util_dbi_suite(void);